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
Merge m-c and fx-team