Bug 1105560 - PACKAGE_UNCHANGED is not thrown inside an Error anymore. r=myk
Bug 639134 - change document color pref to tristate, r=dbaron
Bug 639134 - update pref UI and internet explorer profile migration code for new tristate pref, r=jaws
Bug 639134 - migrate users of the old pref, r=jaws
Bug 1106538 - When deleting a room, the room is not removed from the conversation list - add a notification of the delete completing for the views to be informed. r=nperriault
Merge mozilla-central to fx-team
Bug 1104730 - ship bad-content-16@2x on Linux/Windows, r=jaws

--HG--
rename : browser/themes/windows/bad-content-blocked-16.png => browser/themes/shared/bad-content-blocked-16.png
rename : browser/themes/osx/bad-content-blocked-16@2x.png => browser/themes/shared/bad-content-blocked-16@2x.png
rename : browser/themes/windows/bad-content-blocked-64.png => browser/themes/shared/bad-content-blocked-64.png
rename : browser/themes/osx/bad-content-blocked-64@2x.png => browser/themes/shared/bad-content-blocked-64@2x.png
rename : browser/themes/windows/bad-content-unblocked-16.png => browser/themes/shared/bad-content-unblocked-16.png
rename : browser/themes/osx/bad-content-unblocked-16@2x.png => browser/themes/shared/bad-content-unblocked-16@2x.png
rename : browser/themes/windows/bad-content-unblocked-64.png => browser/themes/shared/bad-content-unblocked-64.png
rename : browser/themes/osx/bad-content-unblocked-64@2x.png => browser/themes/shared/bad-content-unblocked-64@2x.png
Bug 1104921 - UITour: Add Loop panel targets. r=Unfocused

--HG--
extra : rebase_source : 5463747fefe6b31f2d861065956cce1d4d138afa
Bug 1105698 - Fixed brief flickering of feedback form in Loop standalone. r=Standard8
Bug 1105011 - Include locale in tiles payload. r=rnewman

--HG--
extra : rebase_source : 0aae32abcad1292584560ed41ce38342f87eef96
Bug 1105011 - Update testDistribution to check for tiles locale. r=rnewman

--HG--
extra : rebase_source : 97dfca4d90d2303c3f51c0d6b6c4a814503d6142
Bug 1105809 - Centered feedback form in Loop standalone ended room conversation view. r=Standard8
Bug 1104796 - Bookmarks.remove disallows removing any direct child of the places root. r=mak
Backed out changeset c9f946144a73 (bug 1104921) for bc2 failures on some platforms.
Bug 1100742 - Pleasant vibration on long back press. r=bnicholson
Bug 1105802 - Added beta tag to standalone room layout. r=dmose
Bug 1059600 - Set the URI as the initial tab label for javascript links opened in new tabs. r=gijs

--HG--
extra : rebase_source : 07dfeabaf245f791300415df3f072ded5c4fdd81
Bug 1106238 - about:home search icon has a solid background, should be transparent. r=felipe

--HG--
extra : rebase_source : 4683852f44862f9bd3dee83669aeb9ebb4fe41dd
Bug 1105579 - increase browser_lastAccessedTab.js error tolerance further

--HG--
extra : rebase_source : ae86e46ae659fc797cf8f20ae8c909f0a2f3cee9
Bug 1102410 - Make AboutProtocolChild use a unique classID each time it registers a new nsIAboutModule. r=billm.

--HG--
extra : rebase_source : eb937c4c8996441eb92b41e2620820f99937ed90