Bug 661982: Toolkit Add-ons Manager logging to be changed to use Log.jsm;r=irving
Bug 963294 - [e10s] Implement a proxy for the color picker. r=jdm
Back out 5e4cee2fcbc6 (bug 963294) for build bustage
CLOSED TREE
Bug 974258 Manually size autocomplete history popup to the autocomplete's width r=Ratty
DONTBUILD (SeaMonkey-specific code)

--HG--
extra : rebase_source : 76ab88f445cdead2469031ec6dede805a6fd1350
Bug 956657 Share more charset menu code between the view source window and the browser r=Unfocused

--HG--
extra : rebase_source : 7fd31cfc4b8eefee38fa06e63351cc207a9208db
Bug 975792 - ContentProvider tests don't clean up their cursors. r=nalexander
Bug 973192 - call XSync instead of XCloseDisplay unless NS_FREE_PERMANENT_DATA is defined - r=karlt
Bug 856140 - Sync our document.registerElement implementation to the current version of the spec. r=mrbkap
Bug 963294 - [e10s] Implement a proxy for the color picker. r=jdm
Bug 975792 - Follow-up: attempting to fix bustage that only appears on tinderbox. a=test-only
Bug 973338 - add a localization note for .before and .after entities.  r=ttaubert
Bug 973660 - TEST-UNEXPECTED-FAIL AsyncPanZoomController.LongPress when touch action enabled r=drs,kats
merge fx-team to mozilla-central
merge b2g-inbound to mozilla-central
Merge mozilla-central to b2g-inbound