Bug 964510 - Send a delayed startup notification in Fennec. r=mfinkle
Bug 784759 - Delay database creation on startup. r=mfinkle
Bug 964511 - Delay snippets initialization. r=margaret
Ignore native event listeners without a type (bug 962724); r=vporof
Merge mozilla-central and fx-team
Backed out changeset 9c564b61b7f8 (bug 964511) for suspicion of causing frequent rc2 orange on android
Backed out changeset 33060d0581d6 (bug 784759)  for suspicion of causing frequent rc2 orange on android
Backed out changeset e3a37b924215 (bug 964510)  for suspicion of causing frequent rc2 orange on android
[Australis] Bug 963095: adjust toolbar widget panel styling. r=Gijs
Bug 745755 - Generate a marketplace bookmark on profile creation. r=wesj
Bug 961375 - Create a shorter label for dynamic toolbar pref. r=bnicholson
[Australis] Bug 870593: add locale strings to be used for tips in Customize Mode. r=Gijs
Bug 947915 - fix sync button pending state on Australis win7 glass on menubar/tabstoolbar, r=mikedeboer
Bug 964217 - search item is broken in Australis' customize code, r=mikedeboer
Bug 962237 - Fix indentation in toolbar_edit_layout.xml (r=wesj)
Bug 963508 - Don't directly remove elements while iterating on a set (r=wesj)
Bug 965016 - about:accounts should always say "Firefox Accounts", not "Nightly Accounts". r=ttaubert

--HG--
extra : rebase_source : eebff0b5ba1b783fea1bb70fa0b848ac1c7e85e7
Bug 958927 - XUL dialogs for sync unlink and relink confirmation dialogs. r=gavin

Conflicts:
	browser/base/content/aboutaccounts/aboutaccounts.js

--HG--
extra : rebase_source : 2c81fe29d3b85eb8174b988cbaff516e71c39358
Bug 940116 - part 1 of many, fix Australis' customize/quit/help labels, r=jaws

--HG--
extra : rebase_source : c21f1850c72ed7f11defcd00711f48fd8e12f668
Bug 964433 - overflowedItem fix for Australis overflowable toolbar, r=jaws