Bug 1034977 - Fixing 'Debugging' typo in Sqlite.jsm. r=yoric
Bug 1034528, part 1 - Get rid of gfxCachedTempSurface and the Thebes backed gfxContext that it creates. r=Bas
Bug 1034528, part 2 - Remove the Thebes backed gfxContext propagating code from nsCanvasFrame. r=Bas
Bug 1034528, part 3 - Remove the Thebes backed gfxContext propagating code from nsFilterInstance. r=Bas
Bug 1008825 - Synchronous XMLHttpRequest to load options.xul. r=wesj
merge mozilla-inbound to mozilla-central a=merge
merge fx-team to mozilla-central a=merge
merge b2g-inbound to mozilla-central a=merge
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0e75e30d1009
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #21222 from viorelaioia/bug_1032235

Bug 1032235 - [v2.1] Fix failure in test_settings_wifi.py

========

https://hg.mozilla.org/integration/gaia-central/rev/9fbd29b068d0
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1032235 - [v2.1] Fix failure in test_settings_wifi.py
Bumping manifests a=b2g-bump
Bug 1025069 - Use https URL on SUMO's default bookmark (r=mfinkle)
Merge mozilla-central to fx-team
Bug 1025062 - Part 1: Add filter flag to exclude pinned sites in searches (r=rnewman)
Bug 1025062 - Part 2: Add SearchLoader APIs to use the new BrowserDB.FilterFlags (r=rnewman)
Bug 1025062 - Part 3: Exclude pinned sites from the pin dialog's search (r=rnewman)
Merge mozilla-central to b2g-inbound
Bug 1025812 - Part 1: Factor out type updates into separate method (r=rnewman)
Bug 1025812 - Part 2: Refresh TopSitesGridItemView's drawable state when type changes (r=rnewman)
Backed out changeset 161b47c4a8ad (bug 1005870) for memory leaks
Backed out changeset 9beed56cc02a (bug 1025062)