Bug 837537: mentioning how to access simple-prefs via the preferences/service module
Bug 784224: Page-mod tests now work on Fennec
Bug 837537: address review comments
Bug 840014: tabs.open() and windows.open() now take a isPrivate option
Bug 842839: Some add-on SDK files use windows line endings.
Revert "Merge pull request #698 from Gozala/bug/addon-window@820953"

This reverts commit 42cede06862471f3c05cb937cb3d2200b4d3218e, reversing
changes made to 0a7815dcad63db787ca542e648eeb29c2d8f5390.
Backout bug 833877 due to B2G test failures.
Remove unintentional file from bug 833877 backout.
Bug 837537: typo fixes to simple-prefs docs and adding a bit on the comparison of simple-prefs and preferences/service modules
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 840014
bug 840014: checking isPrivateBrowsingSupported before opening a tab in private mode
bug 840014: windows.open with isPrivate: true dnw if private browsing permission is not allowed, and added a fix to tabs.open which would open a private tab in versions of Fennec that have no ptpb ui.
bug 838983: cleanups for bug 825471 6a1aacd6b34ec8cfce1fe2875de45279c8254b54
Merge pull request #741 from erikvold/cleanups

Bug 838983: cleanups for bug 825471 6a1aacd r=@Gozala
bug 840014: fixing a window and tab test and adding tests of opening non private tabs when private browsing support is enabled
bug 840014: link to private-browsing docs from tab and windows docs
Merge pull request #797 from erikvold/840014

Fix Bug 840014: tabs.open() and windows.open() now take a isPrivate option r=@Gozala
Bug 842486 - Fix priority of modules matched by mapping file.
Bug 793925: final part - CFX should recognize modules shipped with platform. r=@gozala
Introduce 3 new cfx options:
-o/--override-modules: use sdk modules from your repository instead of
firefox ones
--strip-sdk: prevent from shipping sdk modules in the xpi
--force-use-bundled-sdk: force the usage of xpi modules instead of firefox
ones
(incompatible with -o and --strip-sdk)
Merge pull request #787 from ochameau/use-mc-modules

Bug 793925: final part - CFX should recognize modules shipped with platform r=@gozala