Bug 950698 - Part 0: Use formatted strings for image. r=bnicholson
Bug 950698 - Change the text for the tip for adding more search providers from Settings->Customize->Search settings. r=bnicholson
Bug 947914 - tests for panel menu default buttons existence and functionality, r=gijs
Bug 970321 - Australis' UITour: make menu panel not break if tour tab is opened in new window, r=Unfocused
Bug 326743: add find clipboard to the list of available clipboard on OSX. r=joshmoz
Bug 326743: support the find clipboard in the find toolbar. r=Unfocused
Bug 326743: use cmd-e to set find-in-page search term to currently selected text. r=Unfocused
Bug 326743: support find-selection in view-source component. r=Unfocused
Bug 326743: update tests to know about the Find Clipboard on OSX. r=Unfocused
Backed out 5 changesets (bug 326743) for m-oth failures

Backed out changeset d498b3fa8908 (bug 326743)
Backed out changeset 820d24250606 (bug 326743)
Backed out changeset 334ddf5ad1fb (bug 326743)
Backed out changeset becbe15a0b5d (bug 326743)
Backed out changeset dbc693bc48c5 (bug 326743)
Bug 942295 - Add basic filter support to Hub panels. r=lucasr
Bug 955953 - FxAccountsClient should set Accept-Language header on all server calls. r=rnewman
Backed out changeset 58ba97597854 (bug 947914) for introducing a new intermittently failing browser-chrome test
Merge m-c to fx-team
Bug 952307 - Move some addon-private JSM's to a subdirectory. r=Unfocused

--HG--
rename : toolkit/mozapps/extensions/AddonLogging.jsm => toolkit/mozapps/extensions/internal/AddonLogging.jsm
rename : toolkit/mozapps/extensions/AddonRepository.jsm => toolkit/mozapps/extensions/internal/AddonRepository.jsm
rename : toolkit/mozapps/extensions/AddonRepository_SQLiteMigrator.jsm => toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
rename : toolkit/mozapps/extensions/AddonUpdateChecker.jsm => toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
rename : toolkit/mozapps/extensions/LightweightThemeImageOptimizer.jsm => toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
rename : toolkit/mozapps/extensions/PluginProvider.jsm => toolkit/mozapps/extensions/internal/PluginProvider.jsm
rename : toolkit/mozapps/extensions/SpellCheckDictionaryBootstrap.js => toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js
rename : toolkit/mozapps/extensions/XPIProvider.jsm => toolkit/mozapps/extensions/internal/XPIProvider.jsm
rename : toolkit/mozapps/extensions/XPIProviderUtils.js => toolkit/mozapps/extensions/internal/XPIProviderUtils.js
Bug 965453 - Remove arrow from secondary submenu items. r=wesj
Bug 965453 - Add submenu for bookmarks. r=wesj
Backed out changeset 400723105403 (bug 952307)
CLOSED TREE

--HG--
rename : toolkit/mozapps/extensions/internal/AddonLogging.jsm => toolkit/mozapps/extensions/AddonLogging.jsm
rename : toolkit/mozapps/extensions/internal/AddonRepository.jsm => toolkit/mozapps/extensions/AddonRepository.jsm
rename : toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm => toolkit/mozapps/extensions/AddonRepository_SQLiteMigrator.jsm
rename : toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm => toolkit/mozapps/extensions/AddonUpdateChecker.jsm
rename : toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm => toolkit/mozapps/extensions/LightweightThemeImageOptimizer.jsm
rename : toolkit/mozapps/extensions/internal/PluginProvider.jsm => toolkit/mozapps/extensions/PluginProvider.jsm
rename : toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js => toolkit/mozapps/extensions/SpellCheckDictionaryBootstrap.js
rename : toolkit/mozapps/extensions/internal/XPIProvider.jsm => toolkit/mozapps/extensions/XPIProvider.jsm
rename : toolkit/mozapps/extensions/internal/XPIProviderUtils.js => toolkit/mozapps/extensions/XPIProviderUtils.js
Bug 961523 - Never show a snippet again after a user dismisses it. r=bnicholson
merge fx-team to mozilla-central