Bug 845387: private-browsing isPrivate should take a content script instance
Bug 751378 - Remove unused CAPS strings from stringbundle. r=bz
Merge pull request #853 from erikvold/845387

Bug 845387: private-browsing isPrivate should take a content script instance
Bug 790195: Expose Promise.all sugar for promised(Array)
Bug 834958 - pwpb update selection module to ignore private windows
- Ignore selections for private windows
Merge pull request #857 from ZER0/private-selection2/834958

Fix Bug 834958 - pwpb update selection module to ignore private windows r=@erikvold
Bug 851161 preventing panels from being used with per-window private browsing
Bug 851320 - private-browsing-supported/test-page-mod fails

Replaced `about:buildconfig` with a more unique URL. The failure is most likely related to another test that open the same URL but with a different private setting. We already had a similar issue, fixed in the same way.
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 851161

Conflicts:
	test/addons/private-browsing-supported/main.js
Merge pull request #859 from ZER0/page-mod-test/851320

fix Bug 851320 - private-browsing-supported/test-page-mod fails r=@mossop
Bug 851320 test that opened window is not private when it should not be private
Merge pull request #860 from erikvold/851320

Bug 851320 test that opened window is not private when it should not be private r=@ZER0
Merge pull request #858 from erikvold/851161

Fix Bug 851161 preventing panels from being used with per-window private browsing r=@Gozala
Bug 851320 - private-browsing-supported/test-page-mod fails

Used the proper open method and ensure everything is close and the window is in the private mode expected.
Merge pull request #861 from ZER0/page-mod-test/851320

Bug 851320 - private-browsing-supported/test-page-mod fails r=@erikvold
Bug 851557: waiting for windows to close before ending tests
Merge pull request #862 from erikvold/851557

Bug 851557: waiting for windows to close before ending tests r=@Mossop
Bug 851557: print tab urls when there are too many windows open
Merge pull request #863 from erikvold/851557p2

Bug 851557: print tab urls when there are too many windows open r=@zer0
Bug 851557: wait for selection before closing the opened window, then wait for the window to close before ending the test