Bug 966599 - [Australis] Restore Defaults should collapse non-default-visible toolbars. r=Gijs
Bug 968891 - [Australis] Disable the button-text fade-out mask during the customization transition. r=Gijs
Bug 867499 - Selecting copy from context menu for selected text dismisses selection. r=jimm
Bug 943521 - Use onepw prototcol in fxa client. r=ckarlof
Bug 957123 - Extend error reporting of AsyncShutdown. r=froydnj
Bug 957123 - Fix the use of File.prototype.close() by a few AddonManager tests. r=Unfocused
Bug 957123 - Complete porting test_TelemetrySendOldPings.js to OS.File. r=rvitillo
Bug 957123 - Better AsyncShutdown error reporting for OS.File. r=froydnj
Bug 968924 - Add shapes to network status bubbles. r=vp
Bug 612253 - Need a shortcut key to focus the input line in web console; r=msucan
Bug 926264: Use a setTimeout before exiting tests and add some additional logs. r=Mossop
Bug 966072 - [Linux] UITour highlight panel appears below the menu panel. r=Enn,Unfocused
[Australis]
Bug 967115 - fix styling of SDK toolbar buttons in Australis, r=jaws
Bug 445461 - restore MRU tab order when restoring a session. r=ttaubert
Backed out changesets bc352c2562ab, bcc79097745a, df35e495ee21, 068044df3406 (bug 957123) for xpcshell orange.
Bug 969511 - Don't update snippets cache unless the update timer fired. r=wesj
Backed out changeset 79b198be3e50 (bug 943521) for xpcshell failures.
Bug 969661 - always re-enable Australis character encoding button when it is removed from an area, r=jaws

--HG--
extra : rebase_source : 5c3cc7cbf7c857ec7aaced350aa8864c9cd939ba
Merge m-c to fx-team
Bug 969766 - [Australis] The reset defaults button should be disabled when a toolbar is enabled during customization mode. r=MattN