auto merge of #1921 : Ms2ger/servo/inhibit, r=jdm

This commit is contained in:
bors-servo 2014-03-14 18:26:24 -04:00
commit 06e22f13ae

@ -1 +1 @@
Subproject commit 6615c7e7d17a4f1a1c0c2adb39765082f5421b6f Subproject commit 62f9290cf04b77024bfde8ebddb83aa386767e98