mozilla-inbound: changeset 138279:fd31bf6cc7794a2e05e32e77268c07bd815a98f8

author	Dão Gottwald <dao@mozilla.com>
	Fri, 12 Jul 2013 09:12:56 +0200
changeset 138279	fd31bf6cc7794a2e05e32e77268c07bd815a98f8
parent 138278	6b8eac57d567eb152fb21b0c4434b24aad267f2f
child 138280	9a46657d49e21c1b9fa36bfee9dbb0f39f8b438f
push id	30913
push user	dgottwald@mozilla.com
push date	Fri, 12 Jul 2013 07:17:10 +0000
treeherder	mozilla-inbound@9a46657d49e2 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bmcbride
bugs	861101
milestone	25.0a1
first release with	nightly linux32 32c3ccd8946c / 25.0a1 / 20130713030205 / files nightly linux64 32c3ccd8946c / 25.0a1 / 20130713030205 / files nightly mac 32c3ccd8946c / 25.0a1 / 20130713030205 / files nightly win32 32c3ccd8946c / 25.0a1 / 20130713030205 / files nightly win64 32c3ccd8946c / 25.0a1 / 20130713030205 / files
last release without	nightly linux32 dde4dcd6fa46 / 25.0a1 / 20130711030204 / files nightly linux64 dde4dcd6fa46 / 25.0a1 / 20130711030204 / files nightly mac dde4dcd6fa46 / 25.0a1 / 20130711030204 / files nightly win32 dde4dcd6fa46 / 25.0a1 / 20130711030204 / files nightly win64 dde4dcd6fa46 / 25.0a1 / 20130711030204 / files

--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -202,17 +202,16 @@ pref("extensions.update.interval", 86400
 pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
 pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                 // restart.
 
 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties");
 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
 
 pref("xpinstall.whitelist.add", "addons.mozilla.org");
-pref("xpinstall.whitelist.add.36", "getpersonas.com");
 pref("xpinstall.whitelist.add.180", "marketplace.firefox.com");
 
 pref("lightweightThemes.update.enabled", true);
 
 pref("keyword.enabled", true);
 
 pref("general.useragent.locale", "@AB_CD@");
 pref("general.skins.selectedSkin", "classic/1.0");