Bug 926033: correct searchString persistence for different searches in findbar. r=mikedeboer
Bug 926033: add regression test. r=evilpie
Bug 931990 - [markup view] Context menu disappearing in markup tree during after mutation; r=paul
Bug 902505 - Set a no-op CSS viewport on Metro to prevent clipping subframes improperly. r=jimm
Bug 917642 - [Helix] Please update the helix blobs. r=nhirata
Merge m-c to fx-team.
Bug 934714 - toggle progressbar on startpage attribute, always call browserUI.update in selectedTab setter to reset windowState in time. r=rsilveira

--HG--
extra : rebase_source : 8bcf7c1f2093f344b5146e3fed0874e0c2adf5e0
Bumping gaia.json for 5 gaia-central revision(s) a=gaia-bump

========

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

Bug 930404 - [Settings] Split up hotspot panel

========

https://hg.mozilla.org/integration/gaia-central/rev/7adb2edab543
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 930404 - [Settings] Split up hotspot.js

========

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

Bug 920839 - Travis is red  - Try reverting pull request 13368 r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/8c900b57bdd2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 920839 - ARIA fixes to value selector."

This reverts commit 2c585692098082a9bb38558c8739a8e91cda5591.

========

https://hg.mozilla.org/integration/gaia-central/rev/b27f450c1e17
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 920839 - Added spinbutton ARIA markup to value picker."

This reverts commit 0d5fd65dc4f43102c38fafb756f0b9c1968d74c3.
Merge m-c to b2g-inbound.
Bug 923442 - Remove UA override for domains starting 2013-10-03. r=lmandel
Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/58804c21cd21
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #13532 from gaye/lightsofapollo-bug-832258-hide-sync-button

Bug 832258 - Hide sync button r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/5084eda4abd4
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge branch 'bug-832258-hide-sync-button' of https://github.com/lightsofapollo/gaia into lightsofapollo-bug-832258-hide-sync-button

Conflicts:
	apps/calendar/js/views/settings.js

========

https://hg.mozilla.org/integration/gaia-central/rev/540bc492232a
Author: James Lal <james@lightsofapollo.com>
Desc: Show/hide sync button when account is added/removed

========

https://hg.mozilla.org/integration/gaia-central/rev/a51cd8a2c98f
Author: James Lal <james@lightsofapollo.com>
Desc: Store.Account#syncableAccounts
Bug 936513 - Remove unused general.useragent.enable_overrides pref. r=nchen
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/cc492bd8ccdf
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #13525 from etiennesegonzac/bug-936095-stack-manager-stay-background-apps

Bug 936095 - Adding "stayBackground" apps at the bottom of the stack. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/9d125b80c4f4
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 936095 - Adding "stayBackground" apps at the bottom of the stack.
r=alive
Backed out changeset a562387a27bb (bug 902505) for mochitest-mc failures.
Bug 935414 - Limit number of constraint terms in filter query. r=lucasr
Bug 846569 - Don't scroll tabs tray when a tab is closed. r=lucasr
merge fx-team to mozilla-central
merge b2g-inbound to mozilla-central