Bug 1002077 - Content pref service shouldn't use nsIFrameMessageListener and doesn't need to electrolify itself. r=mak
Bug 966579 - fix intermittent browser_social_chatwindow_resize oranges. r=mixedpuppy
Bug 996129 - Don't thumbnail sites with cache control headers set. r=kats
Bug 981689 - Show a notice to beta users when we turn telemetry on by default on the beta channel - Firefox Desktop (very final fix). r=bsmedberg.
tests-bustage fix for bug 981689 (the code relies on the current-version preference being always set, which isn't true for testing-prefs-branches)
merge fx-team to mozilla-central