Bug 257061: adding a counter of found matches to the find in page bar. r=Unfocused
Bug 662744 - remove obsolete background image rules, r=dao

--HG--
extra : rebase_source : 02de983ca70eb349cfc31adf4af3ac95df8731a0
Bug 1004410 - allow running mochitests against an arbitrary binary, r=jmaher

--HG--
extra : rebase_source : ba7e34aaffe2dd845b8717a34dc27c7f59983534
Merge mozilla-central and fx-team
Bug 993029: Create an add-on console actor that will be displayed in the console tab of the add-on debugger. r=msucan, r=Unfocused, r=past
Bug 988909 - Move ContextMenuInfoFactory out of HomeListView and into HomeContextMenuInfo. r=lucasr
Bug 988909 - Support context menus in PanelViews. r=lucasr
Bug 944731 - Add a border to color swatches. r=mratcliffe
Bug 991762 - Hide picker tool when debugging addons. r=jryans
Bug 995252 - Conditional breakpoints are always hit. r=past
Bug 1003790 - Remove linear-gradient -moz- prefixes from spectrum.css. r=bgrins
Bug 1004025 - Move themes/*/devtools/font-inspector.css into themes/shared/devtools/font-inspector.css. r=bgrins

--HG--
rename : browser/themes/linux/devtools/font-inspector.css => browser/themes/shared/devtools/font-inspector.css
Bug 1003109 - Replace TaskUtils.spawn with Task.spawn. r=Yoric
Bumping manifests a=b2g-bump
Merge mozilla-central and b2g-inbound
Bug 990086 - Fix local simulator builds on Mac. r=glandium
Bug 1004431 - fix broken CSS in OSX's downloads.css, rs=mconley

--HG--
extra : rebase_source : 6888ff520f42dbdc84ff622ecdcc2baf246559ce
Bug 971096 - add test to parse all our CSS and check for obvious issues, r=mconley

--HG--
extra : rebase_source : 3f17fbda86aa13155c970e157dcec0ae67042696
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5b7dbc28c71b
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #18099 from Moz-TedC/bug-974794-vietnamese-ime-plus-telex

Bug 974794: Vietnamese IME. Incorporates Trung Ngo's Telex IME code.

========

https://hg.mozilla.org/integration/gaia-central/rev/984e8613bbda
Author: Ted Clancy (:tedders1) <tclancy@mozilla.com>
Desc: Bug 974794: Vietnamese IME. Incorporates Trung Ngo's Telex IME code.

========

https://hg.mozilla.org/integration/gaia-central/rev/13b6db7a3c0e
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17553 from svic/Bug_969277

Bug 969277 - NFC pairing UI

========

https://hg.mozilla.org/integration/gaia-central/rev/b561b527f1ce
Author: Arno Puder <arno@puder.org>
Desc: Bug 969277 - NFC pairing UI. r=alive
Bumping manifests a=b2g-bump