Bug 1057848: Restore remote lookup logic, add 2 flags for hotfixing, always set all prefs (r=gcp)
Merge m-c to inbound. a=merge
bug 1009161 - follow-up: add test_nsCertType.js to xpcshell.ini so it'll actually run r=mmc
Bug 1017862 - Remove virtual destructor from BaseProxyHandler. (r=jorendorff)
Bug 1059032 - Don't use PageThumbs in e10s (r=felipe)
Bug 1059007 - [e10s] Update canGoBack for subframe navigations (r=felipe)
Bug 1059007 - [e10s] Compute gMultiProcessBrowser when window opens (r=felipe)
Bug 1059007 - Use useCapture for MozStorageChanged events (r=ttaubert)
bug 1032055 - prevent lto from reordering static xul component constants r=glandium
bug 1052122 - derecursify TreeWalker::NextChild r=surkov
Bug 965022 - Define MOZ_FORMAT_PRINTF(...) macro which expands to __attribute__(format(printf, ...)) where supported. r=froydnj

--HG--
extra : rebase_source : bbfc41dccba336ac290710a8c3ead77ae0d1df5f
Bug 965022 - Avoid passing a TimeStamp to printf in PrintUniformityInfo. r=mchang

--HG--
extra : rebase_source : 73cbb638427eae5987c3b19169ceed1fa47ec190
Bug 965022 - Introduce a PRIuSIZE macro for printing std::size_t. r=jrmuizel

--HG--
extra : rebase_source : 7994c75e65da7506938bb2746e9e86607bc32792
Bug 965022 - Use MOZ_FORMAT_PRINTF for [f]printf_stderr, and fix incorrect usages. r=jrmuizel

--HG--
extra : rebase_source : 667fc18943d84f1ae28579fc23f846f9350e6fe2
Bug 921959 - Re-enable nsIWebNavigation::reload(LOAD_FLAGS_ALLOW_MIXED_CONTENT) tests for e10s. r=billm
Bug 1059888 - Fix a few DEBUG_TABLE_SELECTION compile errors, NPOTB. r=dholbert
Bug 1056136 - Get rid of SDK dependency for simulator addon. r=jryans, r=gps
Bug 1027425 - Make all Proxy handler constructors use MOZ_CONSTEXPR. (r=bz, r=froydnj)
Bug 1055166 - Catch IllegalStateException when recycling Message r=jchen

--HG--
extra : histedit_source : e1a4cec7894fb89147960174cac24444d98cba0a
Bug 1055050 - Add visual warning if the transaction latency is > 100 ms. r=mwoodrow

--HG--
extra : rebase_source : 23140892b8e598c7073dd1b8c83fbddfa0bf52ee