Bug 1039164: Prettier handling of invalid hgrc files by mach. r=gps
Merge m-c to fx-team
Bug 1036581 add telemetry probes to social buttons and sidebar, r=dolske
NO BUG - Fix mistake introduced in a merge to fix this CLOSED TREE
Bug 1017273 - Fix merge conflicts to help fix the CLOSED TREE
Bug 1039925 - Fix tests as a follow-up to Bug 822820. r=trivial
Bug 711941 - part 3 - Timing-function editor tooltip in the rule-view; r=miker
Bug 711941 - part 3.1 - Make sure all devtools/styleinspector test open tabs with utf-8 charset; r=me
Bug 1039457 - Allow yelling in Scratchpad (Shift-Space). r=robcee
Bug 1039448 - Throw when registering an actor client with events is not an EventEmitter. r=past
Bug 1031571 - Remove pointer cursor from hover of netError button. r=unfocused
Bug 807990 - Scroll reader mode page by one page on double tap. r=lucasr,cwiiis
Bug 1041525: Disable GMP OOPInit() during SyncLaunch() until crashreporting fully hooked up r=gfritzsche
Bug 1041207. nsListBoxBodyFrame::Init shouldn't call nsLayoutUtils::GetScrollableFrameFor since it's not the scrolled frame yet. r=mattwoodrow

--HG--
extra : rebase_source : 97ad4db1b77775c632c407185df9db1ad0ff411a
Bug 1039454. Remove InitialOverflowProperty when it no longer applies. r=mats

--HG--
extra : rebase_source : 47f816ce69edfd1b28a802baac6d13ef6610799d
Bug 1013054. Don't propagate non-repaint change hints to the canvas frame. r=mattwoodrow

--HG--
extra : rebase_source : 73b2b8a7d276d2e2064c9d16235b233e76fc7ee1
Bug 863618. Make Range.getClientRects/getBoundingClientRect take account of CSS transforms. r=tn

--HG--
extra : rebase_source : 7a4b8773965f12e89fe0be655819d6d408140c2d
Bug 1003425. When opacity is delegated to an nsDisplayBoxShadowOuter via nsDisplayItem::ApplyOpacity, store the opacity in our geometry so we can invalidate if it changes. r=mattwoodrow

--HG--
extra : rebase_source : f4b44bad8537029b0e03d912b927686aa352d681
Backed out changeset 40954106dc7a (bug 1041525) (incorrect patch landed)
Bug 1041525: Disable GMP OOPInit() during SyncLaunch() until crashreporting fully hooked up r=gfritzsche