Bug 956431 - re-disable Australis' browser_946320_tabs_from_other_computers.js as it's clearly still not fixed on Linux, rs=intermittent-failure
bug 959399. Make metroFx honor the "show my tabs from last time" startup option. r=mbrubeck. r=jimm.
Bug 932947 - Make the styling of Australis' dragged items look more like Philipp's prototype.  r=Gijs, ui-r=phlsa

--HG--
extra : rebase_source : 8006a355aa7e5a2cf310843f1e0b2927d475b75f
Bug 960771 - Uplift Add-on SDK
Bug 947212 - Broadcast form data and move it out of tabData.entries[] r=yoric

From 3111a6c4272a1e058db6a88e02f8688f8c49cc5f Mon Sep 17 00:00:00 2001
Bug 947212 - Tests for broadcasting form data r=yoric

From 53d47a84c35781e73545eab3e665d63c742a9d20 Mon Sep 17 00:00:00 2001

--HG--
rename : browser/components/sessionstore/test/browser_346337_sample.html => browser/components/sessionstore/test/browser_formdata_xpath_sample.html
Bug 887780 - Stop writing state immediately after startup and switch to CrashMonitor for crash detection. r=Yoric, r=ttaubert

X-Git-Commit-ID: bb02f51399059295041176769438b0f451f983bf
Bug 940669 - add button menu to toggle toolbars in Australis' customize mode, r=mconley

--HG--
extra : rebase_source : 096d92876f4827251fd534f7ea76b8dbfd81a691
Bug 960714: Make NPN and ALPN prefs dynamic, r=keeler, r=mcmanus

--HG--
extra : rebase_source : 42ff8c05b682e755d51ec79e2cb26db7cedd382f
Merge mozilla-central to mozilla-inbound
Bug 951268 - Use MaskSurface when drawing A8 filter results. r=Bas
Bug 951268 - Test.
Bug 959570 - Don't draw rounded corners and a highlight line in fullscreen mode. r=smichaud
Bug 944579 - Refuse to create gigantic DrawTargets and surfaces. r=Bas
Bug 960544 - Always export rooting APIs and stop linking unit tests against JS library r=glandium
Bug 675579 - Part 1: Set the dir attribute on the input/textarea element when switching the text direction; r=roc
Bug 675579 - Part 2: Dispatch an input event when changing the direction of a plain text element; r=roc
Bug 959485, part 5 - Remove success from nsJSCID::NewID. r=gabor
Bug 960715, part 1 - Remove XPCWrappedNativeProto::ClassIsMainThreadOnly. r=bholley
Bug 960715, part 2 - Remove nsXPConnect::FindMainThread(). r=bholley