Added getTabForId
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 966730 - Disabling toggle buttons doesn't work

 - Avoid to set unnecessary state properties
 - Set the toggle on window level by default
 - Added test cases
Bug 970540 Implement onLoad for Fennec tabs, fixes page-mod tests
Fix undesired scrollbars in toolbars.
Bug 969976 - Test that tabs on close events do not fire at launch
Merge pull request #1376 from ZER0/toggle-disabled/966730

fix Bug 966730 - Disabling toggle buttons doesn't work r=@gozala
 Bug 849412 - Functions are logged as "null" in Addon SDK content scripts

- Updated the `replacer` for JSON.stringify in order to propagate functions as string only for `console` type of messages
- Added tests
Merge pull request #1405 from ZER0/function-null/849412

fix Bug 849412 - Functions are logged as "null" in Addon SDK content scripts r=@jsantell
Merge pull request #1406 from ZER0/tab-id/964489

fix Bug 964489 - add getTabForId to tabs/utils r=@erikvold
Merge pull request #1407 from Gozala/bug/toolbar-scroll

fix Bug 968814 - Fix undesired scrollbars in toolbars. r=@ZER0
Merge pull request #1399 from jsantell/970540-fennec-tabs-onload

Fix Bug 970540 Implement onLoad for Fennec tabs, fixes page-mod tests, r=@erikvold
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