adding a private-browsing key to the package.json
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 820582
exposing the private-browsing flag to runtime
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 820582
Merge branch '828746' into 820582
bug 820582: fix for tests that used loader w/out metadata
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 820582

Conflicts:
	test/test-private-browsing.js
bug 820582: review updates, self module now exports isPrivateBrowsingSupported, and there is a test that this is true when it should be
Bug 820582: address review comment on diff in lib/sdk/loader/cuddlefish.js
Bug 820582 adding baisc docs, more to come
Bug 820582 - updating package.json to use permissions property
Bug 793925 - Fix support of 3rd party packages.
Merge pull request #808 from ochameau/793925-3rd-party-packages

Bug 793925 - Fix support of 3rd party packages. r=@gozala
Bug 820582: freezing metadata and metadata.permissions in bootstrap.js file now and no longer need to do this in the loader; freezing should only be done for add-on metadata
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 820582

Conflicts:
	test/test-private-browsing.js
bug 820582: updating package.json docs to reflect the new permissions key
Merge pull request #763 from erikvold/820582

Fix Bug 820582 adding private-browsing flag to package.json r=@Gozala
Bug 834960 - pwpb update page-mod module to ignore private windows