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

This commit is contained in:
bors-servo 2013-08-19 17:52:12 -07:00
commit 3c80685758

@ -1 +1 @@
Subproject commit 028080a6cf41e66f7d426f0887b05aea1b4e445e Subproject commit b1295dfd4a8fb739bf70b18f7b6049a5018888af