Bug 1074702 - Part 1 Implement join/refresh/leave with the Loop server on the standalone UI. r=nperriault
Backout 7ef4eeeace2e, bug 1093621, talos regressions (r=backout)
Bug 1095559: Fix logic error in HW acceleration tests for e10s. r=jimm
Merge m-c to fx-team. a=merge
Bug 1086983 - Part 1: Restore editing text when switching between tabs in editing mode. r=lucasr
Bug 1086983 - Part 2: Do not restore autocomplete text from editing mode. r=lucasr
Bug 1094138 - turn off lwt where applicable when clicking devtools button, r=bgrins,jaws

--HG--
extra : rebase_source : f06f4f312b307cec21071958198b02eb815e72d4
Bug 982484 - Device preferences support. r=jryans
Bug 1078353 - handleReaderListStatusRequest should use JS-Java callbacks. r=margaret
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/6792a68929d3
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #25831 from alivedise/bugzilla/1084495_master/commit-close

Bug 1084495 - Commit close in kill, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/2acc4f665843
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 1084495 - Commit close in kill
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2b7f5c48bcc5
Author: Tzu-Lin Huang <dwi019@gmail.com>
Desc: Merge pull request #25863 from dwi2/bug1014418_v2

Bug 1014418 - Dispatching hardware button event in Gaia, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/7bab6e845e1a
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 1014418 - Dispatching hardware button event in Gaia
Bumping manifests a=b2g-bump
Bug 1055460 - replace config request with power request. r=dimi

From 2860c6c7d3783e0f7cf71bcaacbc324dc288c8af Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        |  4 ++--
 dom/nfc/gonk/Nfc.js                | 18 +++++++-----------
 dom/nfc/gonk/NfcGonkMessage.h      |  6 +++---
 dom/nfc/gonk/NfcMessageHandler.cpp | 20 ++++++++++----------
 dom/nfc/gonk/NfcMessageHandler.h   |  4 ++--
 5 files changed, 24 insertions(+), 28 deletions(-)
Bug 1094965 - Move 'fetch' from the script actor to DevToolsUtils. r=fitzgen
Bug 1080801 - re-disable browser_visibleTabs.js, rs=thetreeissad
Bug 1060093 - Implement toolbox to debug chrome of the content process. r=jryans
Bug 1093870 - Make the pinned tab glow pretty on dev edition, r=MattN
Bug 1093931 - Update Loop mocha unit test framework to v2.0.1, which supports Promises, r=Standard8

--HG--
rename : browser/components/loop/test/shared/vendor/mocha-1.17.1.css => browser/components/loop/test/shared/vendor/mocha-2.0.1.css
rename : browser/components/loop/test/shared/vendor/mocha-1.17.1.js => browser/components/loop/test/shared/vendor/mocha-2.0.1.js