No bug - Stop pre-processing aboutWelcomeBack.xhtml. r=me
Backed out changeset ec34b5a1552c (bug 1091260) for bc1 orange
Bug 1084558: Switch the web installer interfaces to use browsers instead of DOM windows. r=Unfocused
Bug 1085622 - Fix E10S_TESTING_ONLY define so that it only ever applies when E10S_TESTING_ONLY config is true. r=ally,glandium.

We were defining the E10S_TESTING_ONLY build-time define with the value of the E10S_TESTING_ONLY config variable,
regardless of the value of E10S_TESTING_ONLY. Even if E10S_TESTING_ONLY in configure was blank, we'd still define
E10S_TESTING_ONLY, which resulted in E10S_TESTING_ONLY ifdef'd code to be included when we didn't want it to.

We now only ever define E10S_TESTING_ONLY iff NIGHTLY_BUILD is defined, and we do it globally.

This also fixes a busted E10S_TESTING_ONLY ifdef that didn't have an endif.

--HG--
extra : amend_source : 9c8fe8db110765272fa666a5c118d388f87c23d7
Bug 1084088 - Use regular home tab background color in Synced Tabs client. r=antlam
Bug 1094017: Component registrar shim doesn't support null contract IDs. r=Unfocused
Merge m-c to fx-team a=merge
Bug 1082764: Use the correct referrer when the content handler catches an XPI install in e10s. r=Unfocused
Bug 1082871: Pass the login manager the browser performing the install. r=unfocused
Bug 1094068: Creating sandbox with expanded principals causes an exception. r=Mossop
Bug 1094068: Typo bustage fix.
Bug 684096 - "The webconsole should display column numbers in addition to line numbers". r=past
Bug 1063206 - better toolbox button for webide. r=jryans
Bug 1064108 - Prevent sideloading apps with too permissive permission. r=jryans
Bug 1068381 - Use an icon for the prettyprint button instead of a label. r=bgrins
Bug 1078365 - ""Feedback:LastUrl" should use JS-Java callbacks". r=margaret
Bug 1080801 - re-enable test waiting for bug 930863 which is already fixed, r=ally
Bug 1080801 - re-enable the working urlbar tests, rs=gavin
Bug 1069757 - re-enable browser_urlbarCopying.js in e10s mode, r=markh
Bug 1093997 / bug 1080801 - re-disable browser_urlbarSearchSingleWordNotification.js for intermittently failing in e10s, rs=test-disabling