Merge mozilla-central to UX

2013-09-06 17:54:20 -07:00
parent 006bf18d91 0e26ffb618
commit 0b9dc83cc5
379 changed files with 9318 additions and 2241 deletions
--- a/browser/base/content/browser-customization.js
+++ b/browser/base/content/browser-customization.js
@@ -83,7 +83,6 @@ let CustomizationHandler = {
      URLBarSetURI();
      XULBrowserWindow.asyncUpdateUI();
      BookmarkingUI.updateStarState();
-      SocialMark.updateMarkState();
    }

    // Re-enable parts of the UI we disabled during the dialog