auto merge of #750 : kmcallister/servo/glfw, r=metajack

This commit is contained in:
bors-servo 2013-08-20 15:12:41 -07:00
commit d67baca1ee

@ -1 +1 @@
Subproject commit b1295dfd4a8fb739bf70b18f7b6049a5018888af
Subproject commit 16fe7a91f0cb201a461b8d05340b859e8f578a8f