Bug 997328 - Add Scope enum to describe SharedPreferences. r=nalexander
Bug 997328 - Update SharedPreferences.jsm to use scopes and mirror GeckoSharedPrefs. r=nalexander
Bug 985234 - add media query for when box model tab is too short. r=bgrins
Backed out changeset 2b5863a3f0ae (bug 997328)
Backed out changeset a7b80bdc8a7c (bug 997328) for Android RC testfailures
Merge m-c to fx-team
Bug 971628 - Avoid exceptions when entering invalid property names in the rule-view; r=miker
Bug 1000695 - Part 1: Rewrite backgroundUpdateCheck() to Task.jsm-based async. r=Unfocused
Bug 1000695 - Part 2: Rewrite browser_hotfix.js to Task.jsm and yield to event loop after receiving onInstallEnded. r=Unfocused
Merge fx-team to m-c.