Bug 997328 - Add Scope enum to describe SharedPreferences. r=nalexander
Bug 950822 - "js/src/vm/Runtime.cpp: remove obsolete code where JS_STACK_GROWTH_DIRECTION > 0" r=bholley
Bug 942367 - DOMMediaStream supports PeerIdentity. r=jib
Bug 942367 - WebIDL changes for peerIdentity constraint. r=jst
Bug 942367 - Stream isolation for WebRTC r=bholley
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
Bug 1000875 - Give nsDOMWindowUtils::CheckAndClearPaintedState the ability to check paints of canvas frames. r=roc
Bug 1000875 - Improve test_fixed_bg_scrolling_repaints.html. r=roc
Bug 1000875 - Add invalidation debugging annotations for layer content type changes. r=roc
Bug 1000875 - Add invalidation debugging annotations for changes of a layer's forced background color. r=roc
Bug 1000875 - Fix nsDisplayBackgroundImage::GetInsideClipRegion calculation for canvas frames. r=roc

The opaque region of the background image display item was incorrectly clipped to the viewport size, offset by the scroll position. nsDisplayBackgroundImage::GetBoundsInternal has a special case for canvas frames that sets the clip area to the whole canvas area; this patch does the same for GetInsideClipRegion.
Bug 1004923 part 6 - Simplify PRMJ_Now as QueryPerformanceFrequency never fails on WinXP and newer. r=njn
Bug 1004923 part 7 - Kill unused calibration.last, returnedTime in PRMJ_Now. r=njn