Bug 913130, part 1 - Modify nsCycleCollector::Collect to allow it to be used at shutdown. r=smaug
Bug 913130, part 2 - Give Collect and ShutdownCollect more consistent ordering. r=smaug
Bug 913130, part 3 - Run {PrepareFor,CleanupAfter} every iteration of ShutdownCollect. r=smaug
Bug 913130, part 4 - Replace body of ShutdownCollect loop with Collect. r=smaug
Bug 904607: Add protocol parser for -digest256 lists (r=gcp).
Bug 883478 - Update ANGLE to pull from 13-08-02. r=upstream,bjacob,bas
Bug 913494 - Remove enablePrivilege usage from tests for password manager. r=bholley
Bug 913510 - Remove vestigial capability.principal prefs usage. r=bholley
Merge m-c to mozilla-inbound.
Bug 888109: Float32 general optimizations for IonMonkey: framework and arithmetic operations; r=sstangl,nbp
Bug 622728 - Add NS_NewRunnableMethodWithArg. r=bsmedberg
Bug 912794 - Separate out the CMS globals and prefs into a singleton gfxColorManagement. r=ncameron

Preferences are now initialized at startup, then updated with callbacks. The methods that access the cached values are not checking the preferences. This lets us better control which thread reads the prefs.

--HG--
rename : gfx/thebes/gfxPlatform.cpp => gfx/thebes/gfxColorManagement.cpp
rename : gfx/thebes/gfxPlatform.h => gfx/thebes/gfxColorManagement.h
Bug 887518 - Move loadAddonManager() to test_provider_addons.js. r=gps
Bug 910808 - Remove call to retrieve preference while not on the main thread. r=khuey

--HG--
extra : rebase_source : a813c3a680c42c712237059104a82c66f7e7bde3
Merge m-c to b2g-inbound.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/792d8e9a8172
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #11994 from lightsofapollo/marionette-vbump-15

 marionette vbump

========

https://hg.mozilla.org/integration/gaia-central/rev/ea80092122da
Author: James Lal <james@lightsofapollo.com>
Desc: marionette vbump
Bug 894927 - Use xhtml instead of xul for b2g main window. r=ochameau

--HG--
rename : b2g/chrome/content/shell.xul => b2g/chrome/content/shell.html
Back out a615811b12e4 (bug 888109) for not actually building
Back out c8687e99dc75 (bug 913510) for Android bustage
Bug 912042 - Remove the last occurences of #include "GLContext.h" in remaining headers - r=jrmuizel