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
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
Enable update badges in Aurora (bug 1095511). r=jwalker f=gavin
Bug 1092580 - Wait for a pass through the event loop before trying to poll for prefs in testOSLocale. r=margaret
Merge fx-team to m-c a=merge