Bug 983803 - cast to nsIDOMEvent directly for generated events, rather than calling CallQueryInterface; r=smaug
Bug 984443 - get rid of #ifndef $OTHER_HEADER bits from xpcom/ as relics of a bygone era; r=ehsan
Bug 984450 - delete unused, deprecated Recycle definitions in nsString.h; r=bsmedberg
Bug 984466 - change CallQueryInterface to assert in cases of trivial conversions; r=ehsan
Bug 984538 - use static_cast in NS_NewDOM*Event rather than CallQueryInterface; r=smaug
Bug 984985 - avoid a useless stat call when loading JS components; r=bholley
Bug 985320 - Add a static Matrix::Scaling method to Moz2D's Matrix. r=Bas
Bug 985322 - Return RGBA instead of BGRA for external gralloc textures. r=nical

Before bug 950050, we'd calculate a format of BGRA, then ignore it and return
RGBA in GetFormat. This just calculates RGBA and returns the format directly.
Bug 518592 - Fix single char <mi> frame type and add a test for dotless i. r=karlt
Bug 940087 - Remove double reset of Cairo font data. r=jrmuizel
Bug 943331 - Make packaging files into omni.ja deterministic. r=gps
Bug 984708 - Make sure we clear out the shutdown timer no matter what. r=bent
Bug 985186 - Unwanted white space for multiple of 10,000 in Korean counter styles. r=jfkthame
Backed out changeset 1028c462d120 (bug 518592) for Werror bustage on a CLOSED TREE.
Merge mozilla-central to mozilla-inbound
Bug 985185 - Identify scroll info layers in the APZC tree log. r=tn

--HG--
extra : rebase_source : 2efbeeff51ea6d1dc0888c0e5f34e3c36168fd63
Bug 985432 - URLSearchParams is not nullable, r=bz
Bug 966820 - Add test for trustbits for Certverifier. r=dkeeler

--HG--
rename : layout/reftests/abs-pos/table-internal-5-ref.html => layout/reftests/abs-pos/table-internal-1-ref.html
rename : layout/reftests/abs-pos/table-internal-6-ref.html => layout/reftests/abs-pos/table-internal-3-ref.html
rename : layout/reftests/abs-pos/table-internal-7-ref.html => layout/reftests/abs-pos/table-internal-4-ref.html
extra : rebase_source : d854bd51bd84e9f7e21980a31c822726e4401dd9
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5635b82282e8
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17084 from flodolo/bug943855_happysad

Bug 943855 - Feedback faces: text not centered, layout broken with long strings

========

https://hg.mozilla.org/integration/gaia-central/rev/d530ea1d84fd
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 943855 - Sade/happy face: layout broken with long strings, text not centered
Bumping manifests a=b2g-bump