Bug 944951 - bootstrap.js must remove the added resource: URIs on unload
Bug 964118 - page-mods need a way to alert content-scripts when the add-on in unloaded
Bug 969976 - Test that tabs on close events do not fire at launch
Bug 952307 - Move some addon-private JSM's to a subdirectory. r=Unfocused
Bug 762556 - Error stack should contain column number. r=jorendorff
Bug 762556 - Error stack should contain column number. r=jorendorff

Missed file from bug 762556
Bug 970280: Don't attempt to clear the prototype on frozen functions. r=Mossop
Merge pull request #1401 from erikvold/969976

Bug 969976 - Test that tabs on close events do not fire at launch r=@jsantell
Merge pull request #1385 from erikvold/944951

Bug 944951 - bootstrap.js must remove the added resource: URIs on unload r=@gozala
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 964118

Conflicts:
	lib/sdk/content/sandbox.js
Merge pull request #1390 from erikvold/964118

Bug 964118 - page-mods need a way to alert content-scripts when the add-on in unloaded r=@gozala
Bug 854990: Detraitify Page-Mod