Bug 868135 - Remove the History sidebar control as a toolbar customization item. r=jaws.
Bug 875798 - Make the default placements for nav-bar reflect reality. r=Gijs.
Bug 874140 - The "Restore Defaults" button should not be display:none when hidden. r=jaws.
Bug 870014 - Cannot insert customizable items to the left of the tabstrip, r=mconley
Bug 870014 - Fix botched conflict resolution and pass targetArea, too; original-r=mconley.
Automated merge with https://hg.mozilla.org/mozilla-central
Bug 873501 - Make code dealing with special widgets more robust, r=mconley

--HG--
extra : rebase_source : 8e02c477fa0095a096cbe312956085fac98981f7
Bug 873501 - Add tests for special widgets, r=mconley

--HG--
extra : rebase_source : 828591aa9888641d810ae73c4289aac276e6ab15
Bug 877524 - Add comment to browser.xul about default placement arrays, r=mconley
Bug 873867 - Adjust panelmultiview binding to allow easy swapping of mainviews. r=Unfocused.
Backed out changeset aa7f6cd90ff8 (Bug 873867)
Bug 878102 - Incorrectly sized icons in the History subview. r=mconley
Re-landing Bug 873867 - Adjust panelmultiview binding to allow easy swapping of mainviews. r=Unfocused.
Bug 853415 - Shuffle before/after around and set an ordinal value on :after to avoid overflow bug, r=MattN

--HG--
extra : rebase_source : 35ee222868c5ed8af0886d67d8dfc6c04514139a
Bug 877603 - registerArea should let non-legacy consumers specify defaults as part of the options, r=jaws
Bug 877178 - Allow add-ons/code to unregister an area, r=jaws
Bug 875326 - Improved tab stroke images with an inner highlight and fixed layering. r=mconley ui-r=shorlander

--HG--
extra : rebase_source : 3192812e43eb5c69d76707160d8eaef26a843c6f
Merge mozilla-central to UX
Merge m-c to ux
Bug 866928: Don't show toolbars in customization mode that are collapsed when not in customization mode, r=mconley