Bug 1004395 - Uplift Add-on SDK to Firefox r=me
Bug 986521 - Remove accidentally pushed empty file r=Mardak
Bug 1008356 - The close button on watch expressions acts weirdly, r=bgrins
Merge m-c to fx-team on a CLOSED TREE.
Bug 1006242 - Disable testMasterPassword on Android 4.0 for frequent failures.
Bug 1005392 - Fix typeaheadfind leak. r=enndeakin
Bug 999518 - don't hit the production FxA server during mochitests. r=froydnj
Bug 1002914 (part 1) - refactor the chat window so it can be used by loop and social. r=mixedpuppy
Bug 1002914 (part 2) - remove SocialChatBar, add chat specific tests and refactor social tests. r=mixedpuppy
Bug 965371 - Part 1: introduce v3 environment format. r=mcomella
Bug 965371 - Part 2: report device type and attributes. r=mcomella
Bug 965371 - Part 3: new docs for v3 device configuration environment. r=mcomella
Bug 1008160 - Rename newtab.sponsored.trial.message to reflect new string content. r=mardak
Bug 965371 - Follow-up: test and misc fixes. r=me
Bug 997328 - Update SharedPreferences.jsm to use scopes and mirror GeckoSharedPrefs. r=nalexander
Bug 1008395 - Make "Finalizing item" messages in the frontend more helpful, r=past
Bug 1008395 - Fix failing tests caused by unintended stringification in the test suite, r=me
Bug 856470 - Login Manager no longer requires initialization at startup. r=dolske
Bug 956332 - Reorganize Login Manager tests and update interfaces. r=dolske

--HG--
rename : toolkit/components/passwordmgr/test/unit/test_storage_mozStorage_notify.js => toolkit/components/passwordmgr/test/unit/test_notifications.js
rename : toolkit/components/passwordmgr/test/unit/test_storage_mozStorage_migrate.js => toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js
Bug 1007788 - Disallow in-source builds for js/src, same as the main m-c tree. r=glandium