Bug 961621 - Fix for intermittent browser_webconsole_bug_766001_JS_Console_in_Debugger.js | Timed out while waiting for: correct source and line test for debugger for index 2; r=me
Merge mozilla-central to fx-team
Bug 900428 - Increase Australis Menu Panel Label Font-Size (part of the patch worked out by Gijs), r=jaws
Bug 913630 - [rule view] Pasting in multiple CSS declarations should automatically split them up;r=pbrosset
Bug 942144 - [Australis] Add-on provided toolbar button icons need proper margins in the menu panel. r=jaws.
Bug 949549 - Ensure that CSP warnings reach webconsole for document hosted on app:// protocol. r=sstamm
Bug 951838 - Add OS.Constants.Path.libSqlite3. r=khuey
Bug 961519 - Prevent touch event mode to be disable on iframes unload. r=paul
Bug 959777 - Move JSON parsing logic into PanelConfig (r=margaret)
Bug 959777 - Factor out PanelConfig validation to be used in all constructors (r=margaret)
Bug 959777 - Define LayoutType, ViewType, and ViewConfig (r=margaret)
Bug 959184 - Use enum instead of boolean to track BrowserToolbar's mode (r=mcomella)
Bug 956576 - Location app bar pops up when fragment identifier changes (URL stuff after hash / number sign). r=mbrubeck
Bug 956576 - Add tests. r=mbrubeck
Bug 960734 - Remove inline script / style in browser/devtools/layoutview/view.xhtml. r=bgrins
Bug 961659 - Prevent touch helper to end up in a broken state. r=paul
Bug 961380 - Should be able to undo closing tabs in private windows r=yoric, ui-r=phlsa

From 0e17ede5f79d9894b8fc7d391615767766dd9aa6 Mon Sep 17 00:00:00 2001

--HG--
rename : browser/components/sessionstore/src/PrivacyLevelFilter.jsm => browser/components/sessionstore/src/PrivacyFilter.jsm
Bug 949216 - Handle toolbar's back press all in onBackPressed() (r=wesj)
Merge fx-team to m-c.