Bug 887394 - Don't collect state right after startup when restoring the initial session; r=yoric
Bug 883220 - Raise the toolbox window if breakpoint is hit, r=vporof
Bug 656273 - Create a toolbar for Scratchpad; r=dcamp
Bug 882997 - Don't DROP or clear wrapper cache flag in GetAndClearExpandoObject. r=peterv
Bug 888381: NPE on closeOptionsMenu() in BrowerToolbar. [r=mfinkle]

--HG--
extra : rebase_source : f779107a2893ae2d40113bc67f461adc0fa6767b
Bug 888411 - Clear NewObjectCache entries with nursery slots or elements on minor GC; r=jandem

--HG--
extra : rebase_source : 0451c424a75a7ad6543ca45d72542d9a40bf7c51
Bug 875013 - Eliminate VPATH usage (part 1 - EXPORTS); r=joey
Bug 888275 - More x86 assembly spew cleanups. r=sstangl
Bug 885940 - Move common code inato marionette-common.js, r=mdas

--HG--
rename : testing/marionette/marionette-log-obj.js => testing/marionette/marionette-common.js
Bug 888474 - Bump Marionette version, a=test-only, a=test-only
Bug 888300 - Respect dom.w3c_touch_events.enabled property on win32 widget. r=jimm
Bug 888067 - Defect - Combined bar shouldnt appear on the js error console panel. r=jimm

--HG--
extra : rebase_source : 2f75449efde0b54e37e45d425054a23d5ad312b8
Bug 833943 - Part 1: add a SessionMigration jsm to take care of migrating sessions, r=ttaubert

--HG--
extra : rebase_source : 68ae76fb342cd2e483c1d5f38a55ef1ce27235a1
Bug 833943, part 2: implement about:welcomeback, r=gavin
* * *
Bug 833943 - Part 5: add about:welcomeback to gInitialPages

--HG--
rename : browser/components/sessionstore/content/aboutSessionRestore.xhtml => browser/components/migration/content/aboutWelcomeBack.xhtml
extra : rebase_source : fc58ab8f648c4e0298959429cbf52de40135bb3d
Bug 833943, part 3: implement migrator changes, r=MattN, sr=gavin

--HG--
extra : rebase_source : d94c1d1c84f9b996d92317a26cbd227c0cb97a44
Bug 887907 - Move OS.File to use Promise.jsm; r=gps

--HG--
extra : rebase_source : cab194eea7781dfd5c14732a77710d6d7904525b
Bug 887814 - Don't use mp-clang in MacPorts bootstrapper; r=BenWa

--HG--
extra : rebase_source : 1513b7f62d62e5250a9382d0ac8ba1f3df8890ab
Bug 884587 - Part 0: Teach FileCopier how to remove unwritable files on Windows; r=glandium

--HG--
extra : rebase_source : 2a340802af58159adaf2c11b0928e237c746f699
Bug 884587 - Part 1: Perform file removal with purge manifests; r=glandium

--HG--
extra : rebase_source : bfe9c0eb27d5b19e26e557af8762bb45c21b949e
Bug 884587 - Part 2: Add EXPORTS files to purge manifest; r=glandium

--HG--
extra : rebase_source : 5b783b192d0324ef7b867a8229d2e5f55d482aac