Bug 1100632 - Remove --disable-opus option and MOZ_OPUS #define macros. r=rillian,ted
Bug 1105851 - Unbreak non-unified non-SPS build after 1054498. r=jcj
Bug 1105104 - Fix the painting of XUL tree connector lines. r=Bas
Bug 1104433 part 1 - Update test_error_events.html to set allow_uncaught_exception; r=Ms2ger
Bug 1104433 part 2 - Update dom/imptests/testharness.js and friends; rs=Ms2ger
Bug 1104433 part 3 - Extend the timeout of dom/imptests/editing/conformancetest/test_runtest.html; rs=Ms2ger
Bug 1048745 - [WebGL2] Integer vertex attributes. r=jgilbert

--HG--
extra : rebase_source : 590eaef6f7582701607e48f7e67bbe7100ff7199
Bug 1091934, increase EventSource tests stress factor, r=wellington
Bug 1048719 - [WebGL2] Remove WebGLQueryRefPtr typedef. r=jgilbert

--HG--
extra : rebase_source : 1215509032baa31835844b4ee875e479de7cea2c
extra : source : 293d398b392ca1959d793298327ce2db170e1ca2
Bug 928833 - Turn on event-regions based hit-testing in APZ. r=botond
Backed out changeset a686c6909b22 (bug 928833)
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/7002469f4662
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #26466 from kumarrishav/Bug-1072856

Bug 1072856 - [Messages] Tapping on empty space above send and attach buttons should assimilate currently edited recipient. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/dfe28e165aaf
Author: kumarrishav <rishav006@gmail.com>
Desc: Bug 1072856 - [Messages] Tapping on empty space above send and attach buttons should assimilate currently edited recipient. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/fac54f7e1a93
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #26439 from jaoo/996391

Bug 996391 - [Sora]Non- / wrong authenticated OMA CP messages are not silently discarded. r=gsvelto

========

https://hg.mozilla.org/integration/gaia-central/rev/eac781247963
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 996391 - [Sora]Non- / wrong authenticated OMA CP messages are not silently discarded
Bumping manifests a=b2g-bump
merge fx-team to mozilla-central a=merge
merge b2g-inbound to mozilla-central a=merge