Bug 856999: Add --no-quit option to prevent from killing firefox when running tests.
Bug 1053883 - Test runner checks for browser windows and tabs even on non-browser apps.
Merge branch 'master' of https://github.com/mozilla/addon-sdk into bug856999

Conflicts:
	app-extension/bootstrap.js
	lib/sdk/system.js
	python-lib/cuddlefish/__init__.py
Bug 856999: fix for using --no-quit and --stop-on-error together, which was quiting before
Backed out changeset (bug 1037235) for breaking WebIDE (bug 1067331)

Revert "Bug 1037235 - toolkit/loader doesn't check module compatibility r=Mossop"

This reverts commit 23bc56c8ba8ea07d1fa1975e12731b37fd9d7e5d.
Bug 1050951 - Enable the page-mod-debugger-post test addon r=me
Merge pull request #1620 from erikvold/856999

Bug 856999: Add --no-quit option to prevent from killing firefox when running tests r=@jsantell
Bug 1009340 logging more information in the chrome test addon
Bug 1069036 - TypeError: redeclaration of variable sliceTest
Bug 1069043 - TypeError: redeclaration of variable mode
Bug 1069050 - Remove support for cfx app type "fennec" which was for running fennec on desktop
Bug 1069053 - Cleanup mobile-utils/bootstrap.js
Merge pull request #1626 from erikvold/1069043

Bug 1069043 - TypeError: redeclaration of variable mode r=@jsantell
Merge pull request #1628 from erikvold/1069053

Bug 1069053 - Cleanup mobile-utils/bootstrap.js r=@jsantell
Bug 1001090 - Part 4: Fix errors in chrome code. (r=zombie,gavin,fitzgen,dcamp,bgrins,fabrice,gwagner,margaret,mrbkap,mak,njn,vicamo)

Conflicts:
	lib/sdk/io/fs.js
Bug 1053883 - Test runner checks for browser windows and tabs even on non-browser apps. r=@erikvold

Merge remote-tracking branch 'kewisch/thunderbird-fixes'

Conflicts:
	lib/sdk/deprecated/unit-test.js
Merge pull request #1627 from erikvold/1069050

Bug 1069050 - Remove support for cfx app type "fennec" which was for running fennec on desktop r=@jsantell
Merge pull request #1624 from erikvold/1069036

Bug 1069036 - TypeError: redeclaration of variable sliceTest r=@gozala
Bug 1071080 - TypeError: redeclaration of variable foo1
Merge pull request #1629 from erikvold/1071080

Bug 1071080 - TypeError: redeclaration of variable foo1 r=@gozala