Bug 826805 - CSP: Allow http and https for scheme-less sources, tests (r=dveditz)
Bug 1089787 - Get glyph widths via Core Text for fonts with embedded color bitmaps. r=jdaggett
Bug 1097615 - Add MOZ_OVERRIDE annotations to subclasses of gfxFont. r=jdaggett
Bug 1097864 - Take GC lock before manipulating arena lists in compacting GC r=terrence
Bug 1098000 - Track the number of compositable references to TextureHost and only unbind gralloc textures after the last ref goes away. r=sotaro
Bug 1090168 - Improve baseline handling for <canvas> text with vertical writing mode - relanding patches 1 and 2, with crash-fix from bug 1099143 folded in. r=jdaggett
Bug 1096054 - Uninitialised value use in Interpret(JSContext*, js::RunState&).  r=jwalden.

--HG--
extra : rebase_source : 49b1ebd5750bf45cf59479c5f8aae06468b223a0
Bug 1091533, Part 1: Don't wrap tgkill() on the Nuwa process. r=BenWa
Bug 1091533, Part 2: Implement NuwaAddThreadConstructor() to allow a thread to perform a custom action after being recreated in the content process. r=khuey,tlee
Bug 1091533, Part 3: Reset thread id in SPS when a content process is forked. r=BenWa
Bug 1094509 - Switch to light devedition theme when light devtools theme is applied;r=Gijs
Bug 1093871 - Telemetry probe for number of items in reading list. r=rnewman
Bug 1094509 - fix a typo in osx/devedition.css;r=jwalker
Merge m-c to fx-team a=merge
Bug 1092880 - Preferences.jsm MIN_INT is off by one r=gavin
Bug 1094505 - Avoid using concatenated name in installer. r=rstrong
Bug 1095420 - UI Tour should cause a migration to aurora when highlighting Sync. r=markh
Fix intermittent failures in browser_webconsole_column_numbers.js (bug 1095527). r=past
Bug 1093368 - Customize mode theme picker shouldn't pass the default theme object to LightweightThemeManager.previewTheme. r=jaws
Don't use the update channel to identify aurora (bug 1095934). r=glandium