bug 1095012 - explicitly disable e10s when not desired
Bug 1023661 - Add support for SeaMonkey to "places" modules
Merge pull request #1702 from zombie/1095012-ci-e10s

bug 1095012 - explicitly disable e10s when not enabled for testing, r=@Mossop
Bug 1095583 - assert.throws should catch thrown strings
Merge pull request #1704 from erikvold/1092882

Bug 1092882 - preferences/service should utilize Preferences.jsm r=@jsantell
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 1095583

Conflicts:
	lib/sdk/test/assert.js
Merge pull request #1705 from erikvold/1095583

Bug 1095583 - assert.throws should catch thrown strings r=@jsantell
Revert "Merge pull request #1704 from erikvold/1092882"

This reverts commit bced24ac402caf08633666f2f651ebc35c8002d0, reversing
changes made to 0d0cd533be3962d00dd7fe248e8574baa056cc9f.

Conflicts:
	lib/sdk/test/assert.js
Merge pull request #1703 from fred-wang/seamonkey-places

Bug 1023661 - Add support for SeaMonkey to "places" modules r=erikvold
Bug 1023661 - make window/utils.js use the 'browser.chromeURL' preference instead of 'chrome://browser/content/browser.xul'. r=erikvold
Revert "Revert "Merge pull request #1704 from erikvold/1092882""

This reverts commit 3c9bbbe41382d3ba30ac6d10cab06eaa20427998.