auto merge of #3989 : jdm/servo/disableiframetest, r=mbrubeck

This commit is contained in:
bors-servo 2014-11-15 10:03:33 -07:00
commit 483e84ca7b