auto merge of #3613 : Ms2ger/servo/glfw, r=jdm

This commit is contained in:
bors-servo 2014-10-08 11:57:35 -06:00
commit e89d4fa6a0

@ -1 +1 @@
Subproject commit 0baf7f662b8d78c8db9930b03832e16fede5d1ac
Subproject commit cec2861dd75eb721694b3176f94a276d77018bde