Merging in version bump NO BUG CLOSED TREE
Merging in branding changes NO BUG CLOSED TREE ba=release
Disable profiling on Aurora NO BUG CLOSED TREE ba=release
Reverting l10n NO BUG CLOSED TREE ba=release IGNORE BROKEN CHANGESETS
backing out the ignore
Reverting l10n for Aurora merge NO BUG DONTBUILD a=merge
Disabling metro in Aurora builds bug 856823 a=release
Bug 871325 - Use proper @2x star icon spritesheet for Retina displays. r=mak,a=gavin.
Bug 870192 - Prevent rounding issues in gfxMatrix::ScaleFactors from combinging with timing issues to cause sporadic invalidation of transforming elements. r=roc, r=akeybl
Bug 864120 - Use a display list item to create the focus ring for <input type=range>. r=roc, a=akeybl
Bug 871278 - Bookmarks menu in AppMenu needs to refer to BookmarkingUI. r=mak,a=lsblakk.
Bug 871322 - Fix broken customizing mode after removing the bookmark menu button. r=mak,a=lsblakk.
Bug 871594 - Replace references to BookmarksMenuButton with BookmarkingUI in browser-places.js. r=trivial,a=lsblakk.
Bug 870868 - Freeze the second number of the UA Gecko version at zero. r=glandium a=lsblakk
Bug 866514 - Basic gUM mochitests for media stream tracks. r=roc, a=akeybl
Bug 864255 - Move more of PeerConnectionMedia shutdown to occur synchronously. r=ekr
Bug 864255 - Fix mediapipeline_unittests to match new assertion. r=ekr, a=akeybl
removing mozconfig lines added in bug 748669 a=release-mgmt DONTBUILD
Bug 871338:  Handle NS_BLOCK_LOOK_FOR_DIRTY_FRAMES lazy marking in GetMinWidth and GetPrefWidth in addition to Reflow.  r=bzbarsky  approval-mozilla-aurora=akeybl

--HG--
extra : transplant_source : %CA%E4%D5%7E%0E%8B%27N%A9%20%13%7B%3B%B7%18BA%05%A1%A7
Bug 867104 - r=ehsan a=bajaj

--HG--
extra : transplant_source : tM%E2%AC%ED%8C%D2%B4%17oBt2u%86%04%0E%40%DD%DE