Bug 964614 - Intermittent TEST-UNEXPECTED-FAIL | tests/test-addon-page.test add-on page deprecation message | only one error is dispatched - 1 == 0 | TypeError: messages[0] is undefined
Bug 853092 - During `cfx test`, the output is polluted by several "info: add-on sdk:" messages in page-mod
bug 958609 - this got fixed on python 2.7.6
Bug 982855 - Passing {position:button} in a panel's constructor does not work

- Issue fixed, test case modified.
Bug 983193 - ui/button: passing a button into button.state() is broken in master
- Fixed regression
- Added tests
Merge pull request #1409 from zombie/958609-python-276

bug 958609 - this got fixed on python 2.7.6
Bug 964545 Add-on SDK page-mods are now debuggable r=dcamp
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 853092

Conflicts:
	test/test-page-mod.js
Merge pull request #1394 from erikvold/853092

Bug 853092 - During `cfx test`, the output is polluted by several "info: add-on sdk:" messages in page-mod r=@ZER0
Bug 981361 Fix intermittent timing failures for throttle tests
Bug 958757 capturing possible errors
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 958757
Merge pull request #1386 from erikvold/958757

Bug 958757 capturing possible errors r=@jsantell
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 964614

Conflicts:
	test/addons/addon-page/main.js
Merge pull request #1375 from erikvold/964614

Bug 964614 - Intermittent TEST-UNEXPECTED-FAIL | tests/test-addon-page.test add-on page deprecation message r=@ZER0
Merge pull request #1433 from jsantell/981361-fix-throttle-tests-part2

Bug 981361 Fix intermittent timing failures for throttle tests
Bug 983333 - Remove Australis checks from our code

- Removed non australis code from our master
Merge pull request #1435 from ZER0/australis-check/983333

Bug 983333 - Remove Australis checks from our code r=@erikvold
Bug 936623 - Deprecate Widget
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 936623

Conflicts:
	test/test-widget.js