Bug 1066827 - Part12: Use a pointer instead of a reference in Parser.addExprAndGetNextTemplStrToken parameter. r=jwalden
Bug 1070912 - Kill Nuwa process when shutdown to release IPC parents. r=khuey
Bug 1085204 - take playback rate into account when calculating presentation time of a video frame. r=cpearce.
Bug 1086530 - Fix Huge regression with using split after landing of bug 1054330. r=kvijayan
Merge b2g-inbound to m-c a=merge
Merge fx-team to m-c a=merge
Bug 1086612 - CSP: Let source expression be the empty set in case no valid source can be parsed - update parser tests (r=sstamm)
Back out 50f2a49570ce (bug 1085027) on suspicion of making Win7 opt mochitest-4 permaorange, a=backout
CLOSED TREE
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/379c5a8dd25e
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #25337 from tauzen/Bug1084160_ndef_formatable_removal

Bug 1084160 - [NFC] NDEF_FORMATABLE, NDEF_WRITABLE removal from NfcManager, r=gweng

========

https://hg.mozilla.org/integration/gaia-central/rev/976be8377da7
Author: Krzysztof Mioduszewski <kmioduszewski@gmail.com>
Desc: Bug 1084160 - [NFC] NDEF_FORMATABLE, NDEF_WRITABLE removal from NfcManager, r=gweng
Bumping manifests a=b2g-bump
Bug 1084502, <template>'s document should inherit mHasHadScriptHandlingObject from the OwnerDoc(), r=bholley

--HG--
extra : rebase_source : 6991665b5d8a494285d632a3b96b10aed43a7b1c
Bug 935846, nsJSEnvironment should get a shutdown notification also in child processes, r=romaxa

--HG--
extra : rebase_source : 782bc88e47ecb750b4220fe01e3f74ebcfa05493
Bug 1087356: make e10s/non-e10s window options appear when no windows are open on Mac, r=felipe
Bug 1086991 - Reduce JS/Java message passing for reader mode (Reader:Add*). r=rnewman
Bug 1086991 - Reduce JS/Java message passing for reader mode (Reader:Remove*). r=rnewman
Backout bug 1084412 for Gij bustage and causing Gaia tree closures
Bug 1083866 - Add test case to check for GC during bailouts. r=nbp
Bug 1083866 - Only remove instructions from the JitActivation after the bailout. r=jandem
Bug 1083866 - Mark bailout frames. r=jandem
Bug 1083866 - Handle potential invalidation of the bailing frame. r=jandem