bug 1073978 - use parent messageManager for tab events
Bug 1074168 jpm tests fail to end
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.
Merge pull request #1667 from Mossop/bug1074493

Bug 1074493: Move test-addon-manager.js to an add-on test so it has an ID to test with. r=erikvold
Merge pull request #1 from mozilla/master

test test