Bug 1063156 - Enable e10s shims by default, even when browser.tabs.remote.autostart pref is false.r=billm
Bug 1067721 - [e10s] Make "Save Snapshot As" context menu item work for e10s. r=felipe.

--HG--
rename : browser/base/content/test/general/bug564387.html => browser/base/content/test/general/web_video.html
rename : browser/base/content/test/general/bug564387_video1.ogv => browser/base/content/test/general/web_video1.ogv
rename : browser/base/content/test/general/bug564387_video1.ogv^headers^ => browser/base/content/test/general/web_video1.ogv^headers^
extra : rebase_source : 1c2fad8158ef3803d653014d7dc1c8ce022dfc40
Merge m-c to fx-team. a=merge
Backed out changeset fe00dbf89462 (bug 1063156) for bustage
Bug 1089810 - Update Private Browsing contextual hint string. r=margaret
Bug 1053434 - Listen for lightweight theme changes and call relevant listeners for devedition theme;r=Gijs
Bug 1002888 - Allow deleting Firefox Account from confirm account screen. r=nalexander

--HG--
extra : rebase_source : 16736f77434d01d37ecd36180064a5a53b1d9179
Bug 1090599 - Upgrade in-tree jsmin to release-2.0.11. r=gps

This updates to release-2.0.11 (sha1: 04374472ed18) from
https://bitbucket.org/dcs/jsmin/.
Bug 1039902 - Minify the Fennec JS code in automation. r=glandium

This patch adds a SpiderMonkey jsshell binary via tooltool and arranges
for it to be used in automation (more specifically, whenever JS_BINARY
is defined).

We'd prefer to build a host SpiderMonkey jsshell, but that's not trivial
right now; and we'd prefer to use a minifier better than the existing
Python jsmin (possibly written in JavaScript), but one step at a time.
Bug 1091320 - fix legacy sync password and passphrase operations with incontent prefs. r=adw
Bug 1079563 (part 1) - replace use of async.js with promises in webchannel tests. r=MattN
Bug 1079563 (part 2) - allow white-listed sites to request troubleshooting info. r=MattN
Bug 1089655 - crash in java: Unhandled error for GeckoRequest: FindInPage, r=wesj
Backed out changeset 780d8f101fe0 (bug 1079563)
Backed out changeset cb3179f8ea2b (bug 1079563) for bc memory leak test failures
Bug 1085694: Add SessionStore tests for crashed tabs. r=ttaubert,smacleod.

--HG--
extra : rebase_source : 4957b2264ac7afcc165f8a472ac9608f812688a8
Backed out changeset c0f433bceae7 (bug 1053434) for frequent windows 7 debug memory leaks
merge fx-team  to mozilla-central a=merge