Merging from default
Merging from default

changeset:   4247:fc796dd40983
tag:         tip
parent:      4245:3865d919c0ee
user:        Chris Manchester <cmanchester@mozilla.com>
date:        Wed Jul 08 13:41:24 2015 -0700
summary:     Bug 1181744 - Fix b2g_emulator_unittest.py failure in developer mode when attempting to specify --test-packages-url instead of --tests-url. r=jlund

--HG--
branch : production

mozilla/build-mozharness,mozilla/build-mozharness