Bug 1040333 - Set principal flags in WorkerPrivateParent ctor. r=khuey
Bug 846200 - Support for granting settings permissions on a per-permission basis
Bug 846200 - Update mochitests to use new settings-api permissions
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bug 1056159 - Extract a helper struct to hold some of the parameters to UpdatePanZoomControllerTree. r=botond
Bug 1056159 - Extract a helper function from UpdatePanZoomControllerTree. r=botond
Backed out d71120161e89 b5d49f1885af (bug 846200) due to missing xpc shell test fix patch
Bug 1056226 - "Unrecoverable" app uninstall does not send manifest information to uninstall event r=marco
Merge m-c to b2g-inbound. a=merge
Merge m-c to fx-team a=merge