Bug 897272 - Add argument to specify cfx xpi output destination
Bug 904996 - Add Tomislav Jovanovic to contributors list
Change Components.interfaces to Ci, fix bug in sample code
Bug 905354 - Update test-tabs.js file

Using ' instead of ", as the style guide recommends
Bug 905354 - Update test-tabs.js file

Using the module.metadata instead of a hack to check if the app is supported
Bug 905354 - Update test-tabs.js file

Using the safer method to close windows
Bug 905354 - Update test-tabs.js file

Updating the test/tabs/test-firefox/tabs.js file to use the new test framework
Bug 905472 - Intermittent TEST-UNEXPECTED-FAIL | tests/test-tabs.test window focus changes active tab | the activated tab url is correct
Merge pull request #1173 from erikvold/905472

Bug 905472 - Intermittent TEST-UNEXPECTED-FAIL | tests/test-tabs.test window focus changes active tab | the activated tab url is correct. r=Mossop
Merge pull request #1168 from erikvold/904996

Bug 904996 - Add Tomislav Jovanovic to contributors list
Merge pull request #1171 from darktrojan/docs

Bug 905431 - Change Components.interfaces to Ci, fix bug in sample code
Bug 899630 - Intermittent Jetpack tests/test-tabs.testTabsEvent_onCloseWindow

Removing the use of a special window closer to trigger end of test
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 899630v2

Conflicts:
	test/tabs/test-firefox-tabs.js
Merge pull request #1174 from erikvold/899630v2

Bug 899630 - Intermittent Jetpack tests/test-tabs.testTabsEvent_onCloseWindow r=@ZER0
Bug 905354 - Update test-tabs.js file

Updating the test/tabs/test-fennec-tabs.js file to use the new test framework
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 905354

Conflicts:
	test/tabs/test-firefox-tabs.js
Merge pull request #1152 from darktrojan/master

Bug 897272 - Add argument to specify cfx xpi output destination. r=Mossop
Bug 888804 Converting the test-firefox-windows.js file to use the new test framework r=@jsantell

(cherry picked from commit 3b934529fb0b5c8158d71510e0671211b9bd4f12)
Revert "Bug 888804 Converting the test-firefox-windows.js file to use the new test framework r=@jsantell"

This reverts commit 907e07080bc3316d79b0e909e1fd1b476a357152.
Merge pull request #1175 from erikvold/905354

Bug 905354 - Update test-tabs.js file r=@ZER0