Bug 1005405 - Ensure that multiple frame changes coalesce correctly. r=dbaron

- When a parent frame and its child overflow are changed simultaneously,
  the strongest ChangeType should be cascaded up to the parent frames.
Backed out changeset df4ae5ba7d6e (bug 978861) due to m-o test failures.
Bug 978861: disable prefillWithSelection on OSX by default, fix its semantics when enabled. r=ehsan
Bug 995847 - Add -h and --help support to mach. r=glandium

* |mach --help| prints the global help message as |mach help|.
* |mach command --help| prints the command help message as
  |mach help command|.
Backed out changeset f965ef325903 (bug 999574) for landing with the wrong reviewer in the commit message.
Bug 999574 - Wait for remote-browser-shown event before dispatching runapp command r=vingtetun

---
 b2g/chrome/content/runapp.js | 92 +++++++++++++++++++++++++++++++-------------
 1 file changed, 65 insertions(+), 27 deletions(-)

DONTBUILD
Bug 1006283 - Set and display proper type on AudioParams for web audio editor. r=vp
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c5637310d63e
Author: Michał Budzyński <michal@virtualdesign.pl>
Desc: Merge pull request #18954 from michalbe/Bug984584

Bug 984584 - Contacts phone numbers highlighted red when missed

========

https://hg.mozilla.org/integration/gaia-central/rev/a0908ee5ac2a
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: [Bug 984584] - Contacts phone numbers highlighted red when missed
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f939e8c12563
Author: Michał Budzyński <michal@virtualdesign.pl>
Desc: Merge pull request #18986 from michalbe/Bug1003767

Bug 1003767 - Do not share contacts photo via NFC

========

https://hg.mozilla.org/integration/gaia-central/rev/c9b8c932b2d8
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: Bug 1003767 - Do not share contacts photo via NFC
Bumping manifests a=b2g-bump
Backed out changeset 7b05ebf0a2d5 (bug 858787) for making bug 970728 nearly perma-fail.
Merge b2g-inbound to m-c.
Merge fx-team to m-c.
Merge m-c to b2g-inbound.
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e3d8d481edae
Author: Michał Budzyński <michal@virtualdesign.pl>
Desc: Merge pull request #18938 from michalbe/Bug969393

Bug 969393 - Import contacts from SD Card

========

https://hg.mozilla.org/integration/gaia-central/rev/c5e6276f2452
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: Bug 969393 - Import contacts from SD Card When "Default media location" is not 'SD Card'
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/cbd0b3d032bd
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18997 from KevinGrandon/bug_841422_shared_move_contact_test

Bug 841422 - Follow-up, move contact2vcard_test.js to sharedtest app

========

https://hg.mozilla.org/integration/gaia-central/rev/39bd5f6562e2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 841422 - Follow-up, move additional tests for shared code into sharedtest app r=me
Bumping manifests a=b2g-bump
Merge fx-team to m-c