Bug 711401 - prettyify CSS source even if it has spaces or newlines at the end of file; r=jwalker
Bug 976738 - Devtools Themes - use light theme as default theme; r=robcee
Bug 978752 - fix Windows Classic gradient for Australis, r=mconley

--HG--
extra : rebase_source : 9653aec995257946f65c826f439539c848da6d63
Bug 963143 - downloads animation no longer showing when button is in Australis' menu or overflow panel, r=mak

--HG--
extra : rebase_source : 2e74cb17e9a080a2dd5bd27b501b4fe1719bd310
Bug 983439 - Ignore mercurial merge conflict files in resources. r=nalexander
DONTBUILD

--HG--
extra : amend_source : 32264340bdabf2c66e71967e1f33158b9a5f5cde
Bug 981941: avoid showing the "save password" notification for about:accounts, r=dolske

--HG--
extra : rebase_source : b42551fb1ce0f12983cce62a81c589600f77dc31
Bug 982167: adjust layout of Sync pref pane so that checkboxes don't span the entire width of the prefpane, r=smacleod

--HG--
extra : rebase_source : c05e5568d4e6f693033e83c9b4afe13077826401
Bug 982965 - ensure we fail if getKeys can't get kA or kB. r=ckarlof
Bug 983699 - fix widgets in Australis overflow panel to show view on the right anchor, r=jaws

--HG--
extra : rebase_source : 99656dbcbda90cdb19b85c2e48795f7656fca697
Bug 972061 - Update style of Sync intro and manage pages r=ttaubert

From ff216e4d7d2c5957c09ba03028b0fec76303ab30 Mon Sep 17 00:00:00 2001
---
 .../base/content/aboutaccounts/aboutaccounts.css   |  36 --
 .../base/content/aboutaccounts/aboutaccounts.xhtml |   8 +-
 .../aboutaccounts/images/graphic_sync_intro.png    | Bin 5566 -> 9304 bytes
 .../aboutaccounts/images/graphic_sync_intro@2x.png | Bin 10764 -> 19655 bytes
 browser/base/content/aboutaccounts/main.css        | 380 ++++-----------------
 5 files changed, 76 insertions(+), 348 deletions(-)
Bug 983761 - Use tab-active-middle@2x.png with lightweight themes for HiDPI. r=Gijs
Bug 983761 - Add support for CSSGroupingRules in LightweightThemeListener. r=Gijs
Bug 976633 - Clicking Cancel on merge warning should not initiate Firefox Account creation. r=markh
Bug 983913 - ensure failure to reject a promise is actually reported. r=ttaubert
Merge m-c to f-t
Bug 969672 - Handle declined engines on Android. r=nalexander
Merge m-c to fx-team
Bug 979030 - Fix srcdir loader breakage after GCLI split up; r=mratcliffe

--HG--
rename : toolkit/devtools/gcli/source/mozilla/gcli/mozui/completer.js => toolkit/devtools/gcli/source/lib/gcli/mozui/completer.js
rename : toolkit/devtools/gcli/source/mozilla/gcli/mozui/ffdisplay.js => toolkit/devtools/gcli/source/lib/gcli/mozui/ffdisplay.js
rename : toolkit/devtools/gcli/source/mozilla/gcli/mozui/inputter.js => toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js
rename : toolkit/devtools/gcli/source/mozilla/gcli/mozui/tooltip.js => toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js
Merge f-t to m-c