Bug 983653 - UITour: Make the highlight effect a circle on the bookmarks combo button. ui-r=shorlander, r=MattN
Bug 981258 - Set the breakpoints in browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js before executng the IIFE so that the IIFE's Debugger.Script can't be GC'd before the breakpoints are set; r=past
Bug 942270 - Refactor context menu code. r=bnicholson
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/eac5f068d5d3
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #17178 from cctuan/982645

Bug 982645 - [Gaia] [Build] unit test for preferences.js

========

https://hg.mozilla.org/integration/gaia-central/rev/0471e039844d
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 982645 - [Gaia] [Build] unit test for preferences.js
Bumping manifests a=b2g-bump
Merge m-c to b-i
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

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

Bug 946852 - [Email] Search Mail field appears twice

========

https://hg.mozilla.org/integration/gaia-central/rev/861e94eee5ac
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 946852 - [B2G][Email] Search Mail field appears twice on email search filter page when user reveals drag down search field r=jrburke
Bumping manifests a=b2g-bump
Merge b-i to m-c
Merge f-t to m-c
Merge m-c to m-i