Bug 962286 making sdk/window/utils isFocused export a dispatcher which now works for high level windows
bug 983322 - sanitize preferencesBranch
bug 1044197 - don't ship httpd.js
bug 983322 - keep test logic out of shipping code
bug 1073978 - use parent messageManager for tab events
Bug 1074168 jpm tests fail to end
bug 1073923 - add url.toJSON() method
bug 1056380 - avoid double-attach
bug 1073971 - avoid some warnings on about: page
Merge pull request #1658 from zombie/1073923-url-toJSON

bug 1073923 - add url.toJSON() method, r=@jsantell
Merge pull request #1648 from zombie/983322-sane-prefsBranch

bug 983322 - sanitize preferencesBranch, r=@erikvold
Revert "bug 983322 - sanitize preferencesBranch"
Merge pull request #1661 from zombie/1056380-double-attach

bug 1056380 - prevent double-attach, r=@jsantell
Merge pull request #1665 from mozilla/revert-1648-983322-sane-prefsBranch

Revert "bug 983322 - sanitize preferencesBranch"
Merge pull request #1662 from zombie/1073978-remoteness-change

bug 1073978 - use parent window.messageManager for tab events, r=@Mossop
Bug 1074493: Move test-addon-manager.js to an add-on test so it has an ID to test with.
Merge pull request #1663 from erikvold/1074168

Bug 1074168 jpm and mochitest-jetpack tests fail to end r=@gozala
bug 1003253 - better logging after test timeout, update test
Merge pull request #1655 from zombie/1003253-timeout-after

bug 1003253 - better logging after test timeout, update test, r=@Mossop
Revert "Bug 1036625: Loader shouldn't be attempting to load files just to resolve modules."

This reverts commit 337cd273188eea52e07aa355d6b0490d077cb1f0.