Bug 863571 - Enable source map xpcshell tests on B2G; r=mdas
Bug 777681 - [rule view] Abbreviate long CSS file name source links. r=jwalker
Bug 862363 - Sync the killswitch upon (un)registering of a tool and respect it in Options Panel, r=jwalker
Merge m-c to fx-team.
Bug 861409 - Use a content script to listen for pageshow events; r=yoric,jaws
Bug 862442 - Use a content script to listen for input and change events; r=yoric
Bug 863227 - Lazily retrieve list of nsIDocShell.allow* properties to (re)store docShell capabilities; r=yoric

--HG--
rename : browser/components/sessionstore/test/browser_493467.js => browser/components/sessionstore/test/browser_capabilities.js
Bug 847191 - Integration with legacy interfaces to start new downloads. r=enn
Bug 851461 - Make the JavaScript API for downloads available in parallel to nsIDownloadManager. r=mak
Merge m-c and fx-team
Bug 862556 - Make nsChildView.mm::DrawWindowOverlay thread safe. r=nrc
Bug 809273 - Add AutoLockTextureHost and use it to avoid needing to manually unlock. r=nrc
Bug 809273 - Let ContentHost create an EffectComponentAlpha if necessary. r=nrc
Bug 809273 - Remove old buffer provider code. r=nrc
Bug 809273 - Add code for handling dual buffers in ContentHost. r=nrc
Bug 809273 - Add code handling dual buffers in ThebesLayerBuffer. r=roc
Bug 809273 - Make mUseIntermediateSurface and mSupportsComponentAlpha on BasicShadowableContainerLayers match the compositor. r=roc
Bug 809273 - Remove unused BasicShadowContainerLayer. r=nrc
Merge m-c to m-i