Bug 843438 - ignore private tabs on fennec when there is no private-browsing permission
Bug 839746: global private windows (Fx <=19) are not ignored, per widnow private windows (on Fx > 19) still are
Merge pull request #888 from Gozala/bug/indipendent-panel@839746

Bug 839746 - global private windows (Fx <=19) are not ignored r=@ZER0
Actually disable tests for global PB if not supported a=@gozala
Merge pull request #856 from ochameau/fennec-pb-tabs

Fix Bug 843438 - ignore private tabs on fennec when there is no private-browsing permission r=@erikvold
Bug 854465: Use in-XPI modules if a preference is set.
Merge pull request #890 from Mossop/bug854465

Bug 854465: Use in-XPI modules if a preference is set. r=gozala
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 839746v2

Conflicts:
	test/addons/private-browsing-supported/main.js
	test/addons/private-browsing-supported/test-global-private-browsing.js
	test/test-page-mod.js