Bug 858970 - Wait for tab close before switching to next test in testWindowTabsObject_alt.
re-factored tests for unique ids to use promises.
Bug 844180: Share content script and page zones.
Merge pull request #931 from canuckistani/bug_859637

Bug 859637: re-factored tests for unique ids to use promises. r=@ochameau
Documentation for lang/functional module
Merge pull request #933 from jsantell/func-documentation

fix bug 859507: Document lang/functional module, r=@wbamberg
Merge pull request #941 from ochameau/bug858970

Bug 858970 - Wait for tab close before switching to next test in testWindowTabsObject_alt. r=@erikvold
Bug 858954 - Wait for delayed startup before touching browser window.
Bug 862085: Correct a typo in the xpcom docs.
Merge pull request #939 from ochameau/bug858954

Bug 858954 - Wait for delayed startup before touching browser window. r=@erikvold
Bug 812417: Listen for domwindowclosed instead of unload when closing a
toplevel window.
Bug 732294 - Panel constructor lacks a way to set position of panel other than "centered"

Implemented the API described in [JEP Panel Positioning](https://github.com/mozilla/addon-sdk/wiki/JEP-Panel-positioning) and discussed in etherpad.
Merge pull request #826 from ZER0/panel-align/732294

fix Bug 732294 - Panel constructor lacks a way to set position of panel other than "centered" r=@gozala
Merge pull request #943 from Mossop/bug862085

Bug 862085: Correct a typo in the xpcom docs.
Merge pull request #944 from ochameau/bug812417

Bug 812417: Listen for domwindowclosed instead of unload when closing a toplevel window. r=@erikvold
Bug 860069: Missing semicolons in add-on SDK's promise.js. r=Mossop
Merge pull request #942 from ochameau/contentScriptZone

Bug 844180: Share content script and page zones. r=@mossop
Backout bug 812417 "Pull request #944 from ochameau/bug812417"

This reverts commit b7111ece7367bea97d1582b935cd6bca2101fc85, reversing
changes made to 8ba3879d832ecb554e27147e77bd4060b5bb70b8.
Bug 812417: Listen for domwindowclosed instead of unload when closing a toplevel window.
Merge pull request #948 from ochameau/bug812417-2

Bug 812417: Listen for domwindowclosed instead of unload when closing a toplevel window. r=@mossop