Bug 899052 - Implement Addon Thread Actor. r=fitzgen, r=shu
Bug 961165 - Remove inline scripts from scratchpad.xul. r=bbenvie
Bug 973538 - Throw an exception on undefined values for OS.Path.join() and OS.Path.winGetDrive(). r=Yoric
Bug 973571 - Do not allow gcparam to set the mark stack limit while a gc is in progress; r=billm

--HG--
extra : rebase_source : 620edcc859a86d8cb6e7d525de4079238a89a07e
Bug 981110 part 1: Remove some random, skip, and fuzzy annotations in SVG / SMIL reftests. r=jwatt
Bug 981110 part 2: Remove a bunch of 'skip-if' annotations for B2G, in SMIL reftests. r=jwatt
Bug 981430 - Convert WinUtils consumer of imgIContainer::GetFrame to act on a Moz2D SourceSurface. r=mattwoodrow
Bug 967153: Update to NSS 3.16 beta 5 (NSS_3_16_BETA5), r=me

--HG--
extra : rebase_source : 8dfdcd121214b084acc01025a2cd989ccf6a603c
Bug 947584: Use official IANA names for cipher suites in PSM, r=cviecco

--HG--
extra : rebase_source : fafec912dc96480cb4f00bddec00d40e5e9db088
Merge m-c to m-i
Bug 980810 - Part 2: Fix clang -Wstring-conversion warning in layout. r=dbaron
Bug 980810 - Part 3: Fix clang -Wstring-conversion warnings in UDPSocket and mtransport code. r=bwc
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fc42c76396b5
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #16652 from crh0716/975918

Bug 975918 - Support DSDS for voice mail r=jaoo, etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/fa101d064b12
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 975918 - Support DSDS for voice mail
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a30074503b9b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #16991 from KevinGrandon/bug_980164_systemv2_logo_loader

Bug 980164 - [System2] LogoLoader updates r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/30b24b421a0b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 980164 - [System2] LogoLoader updates r=alive
Bumping manifests a=b2g-bump
Bug 981112 - Destruct MediaDecoderReader first r=padenot
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ec20da95a33c
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #16888 from alivedise/bugzilla/977934_master/render_activity_inside_caller

Bug 977934 - Render activity inside caller, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/618cd111be20
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 977934 - Render activity frame inside its caller
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/87b13252a973
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Bug 975918 - Support DSDS for voice mail"

This reverts commit 9624c4d03cbbd4042cf26d2e56c42b58849b4c5f.