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 756214 - update, re-enable testStringOverload
Bug 968480 - addon-page testaddon: TypeError: document.defaultView is null
Do not unwrap X-rays.
Merge pull request #1429 from Gozala/bug/proper-unwrap@982684

Bug 982684 - Do not unwrap X-rays. r=@Mossop
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 #1413 from zombie/756214-test-js-proxy

bug 756214 - update, re-enable testStringOverload r=@gozala
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