Merge mozilla-central into mozilla-inbound

This commit is contained in:
Ehsan Akhgari 2012-12-12 00:15:48 -05:00
commit ff4e584f23

View File

@ -123,6 +123,7 @@ this.Social = {
if (active) {
Services.prefs.clearUserPref("social.active");
currentProvider = providers[0];
currentProvider.active = true;
}
} catch(ex) {}
}