Bug 855030 - Parser.jsm should support fat arrow functions, r=past
Bug 854185 - Frontend shouldn't mix promises, event listeners and callbacks on initialization/destruction, r=past
Merge m-c to fx-team.
Bug 839280: Fix document leak in nsLoginManager. r=dolske
Bug 828051: Add GCLI commands for the JavaScript Profiler. r=dcamp
Include AppProtocolHandler in desktop Firefox packages (bug 850421); r=bsmedberg

This allows the JavaScript debugger to properly present script URLs when remotely debugging Firefox OS.
Bug 772119 - Expose source mapped sources over the remote debugging protocol; r=past
Bug 851132 - Style editor shows wrong URL when middle-clicking a file name; r=mratcliffe
Backout a69d60d90110 (bug 772119) for bustage
Bug 847867 - Ensure extensions.bootstrappedAddons is updated to reflect live changes. r=Mossop
Bug 806271 - Introduce new settings type, OPTIONS_TYPE_INLINE_INFO. r=Mossop

--HG--
rename : toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/bootstrap.js => toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js
rename : toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/install.rdf => toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/install.rdf
rename : toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul => toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/options.xul
rename : toolkit/mozapps/extensions/test/browser/browser_inlinesettings.js => toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js
Bug 837008 - Make the Add-ons Manager search textbox adapt to small window size. r=Mossop
Bug 802454 - Log messages for 404 errors when checking for add-on updates should include the URL. r=Unfocused
Merge m-c to fx-team.
Merge inbound to m-c.
Added tag FIREFOX_AURORA_22_BASE for changeset 1c070ab0f9db
Merging in version bump NO BUG
Merge m-c to inbound.