Bug 1009279 - Change the margins to padding in the browser toolbar. r=bnicholson
Bug 999865 provide ui indication of new provider buttons after activation, r=markh, r=unfocused
Bug 916497 - PageThumbs no longer expires thumnails being tested to fix intermittent oranges. r=adw
Merge m-c to fx-team
Backed out changeset b9cee613c432 (bug 999865) for bc1 bustage on a CLOSED TREE
Bug 917480 - Pre: commenting. r=nalexander
Bug 917480 - Part 0: refactor checking of isGeckoPref inside GeckoPreferences. r=liuche
Bug 917480 - Part 1: add basic locale preference handling to GeckoPreferences. r=liuche
Bug 917480 - Part 2: add 'Language' section to top-level preferences, allowing for browser locale switching. r=nalexander
* * *
Bug 917480 - Part 2d: compute locale list at build time.
Bug 917480 - Part 3: manifest changes for locale changes on API 17. r=nalexander

locale and layoutDirection need to appear together in android:configChanges
attributes. We specify these in any activity that we don't want Android to
automatically relaunch when a locale change occurs, which is most or all of
them.
Bug 917480 - Part 4: handle resetting to the system default locale. r=nalexander
Bug 1007549 - Simplify the control flow in allocateFromArenaInline(). r=jonco.

--HG--
extra : rebase_source : 7f00691522a1d7b86dddf9bb93869203191f4190
Bug 1005442 - Strip moz-nullprincipal UUIDs when diffing memory reports.  r=mccr8.

--HG--
extra : rebase_source : 83e9f2d08b1cb1672b9bef0fddcd8bd34cfa4e18
Bug 981780: fix disable-webrtc r=glandium
Merge m-c to inbound
Bug 981780: disable some dom/media webrtc tests if webrtc isnt enabled r=drno
Bug 917480 - Part 5: UI telemetry for locale switching. r=mfinkle
Bug 917480 - Part 6: tablet mode. r=nalexander
Bug 1009732 - Do only one Proguard pass when build is not MOZILLA_OFFICIAL. r=ckitching
DONTBUILD

This continues the convention that a developer build is when
MOZILLA_OFFICIAL is not defined.
Bug 1007345 - Create an audionode inspector in the web audio editor tool. r=vp