Merge m-c to inbound. a=merge

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-08-18 13:11:47 -04:00
commit 3b0d95ee9e

View File

@ -17,7 +17,7 @@
<script class="testbody" type="application/javascript;version=1.8">
SimpleTest.waitForExplicitFinish();
requestLongerTimeout(2);
SimpleTest.requestLongerTimeout(2);
var origins =
[{ server: 'http://example.org' },