Merge m-c to fx-team.
commit5f5fcba6450fdf9f497cb509ae35a2d91c94fac6
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 21 Nov 2013 16:39:17 +0000 (21 11:39 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Thu, 21 Nov 2013 16:39:17 +0000 (21 11:39 -0500)
tree78785830f02e349b48c699648fd819c047aa9905
parent976017db14f03fffdddbcc11ca45417c18ac1148
parentd18213092467cacb6bbf0f8005a1ced677c27ae6
Merge m-c to fx-team.
build/automationutils.py
testing/mochitest/browser-test.js