Bug 998372 - part 1 - lift regex construction out of FindProxyForURL; r=jmaher
Bug 998372 - part 2 - lift origins out of FindProxyForURL and make origin lookups more efficient; r=jmaher
Bug 998372 - part 3 - remove swathes of conditional logic from FindProxyForURL; r=jmaher
Bug 998372 - part 4 - explain the escape-fest in permissions.py better; r=jmaher
Bug 26767 - FTP client detects UTF-8 if server returns UTF8 on FEAT. r=michal.novotny
Bug 998396: Fix gethash completions, urlclassifier.malware_table and urlclassifier.phish_table may be comma-separated lists (r=gcp)
Bug 999477: Fix FindInReadable calls in ApplicationReputation (r=gcp)
Backed out changeset 73bb0c592bf1 (bug 998396) for debug build failures; CLOSED TREE
Bug 999407 - add --setenv option for mochitests run through mach; r=jmaher


DONTBUILD because NPOTB
Bug 998507 - add BinarySearch (r=sunfish)

--HG--
extra : rebase_source : 6ba04575a5dd8a886235e6799bc790c7a3afc64f
Bug 991600 - Make sure that registering the content policy doesn't race with the call to sendBeacon; r=rbarnes
Bug 807168 - Move GCMarker into gc/Tracer.h; r=jonco

--HG--
extra : rebase_source : 031495e6bb5510009eb871866e9f5e3beda24211
Bug 807168 - Move rarely used code in GCMarker out of the header; r=jonco

--HG--
extra : rebase_source : f8895a2a2a00f31a45900cdbc718a19aed6262d9
Bug 998507 - add some assertions to BinarySearch (r=me)
Bug 998741 - Fix XULRunner builds; r=bsmedberg
Bug 946021 - Enable ARM assembly for Opus. r=ted,derf
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/4a7671463029
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #18523 from crdlc/bug-998905

Bug 998905 - After importing contacts photos are not shown in the contac...

========

https://hg.mozilla.org/integration/gaia-central/rev/2bcba9129fe4
Author: crdlc <crdlc@tid.es>
Desc: Bug 998905 - After importing contacts photos are not shown in the contacts list

========

https://hg.mozilla.org/integration/gaia-central/rev/ac35e0a4d741
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18525 from hfiguiere/bug987383-2

Bug 987383 - Disable the screenshot on timeout introduced by bug 962918 r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/fe3e07586455
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 987383 - Disable the screenshot on timeout introduced by bug 962918. r=kgrandon

Based on Kevin Grandon initial patch.

========

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

Bug 962918 - Update gaia-node-modules to v1.1.7

========

https://hg.mozilla.org/integration/gaia-central/rev/7bc70b10ccbf
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 962918 - Update gaia-node-modules to v1.1.7
Bumping manifests a=b2g-bump
Bug 996850 - Part 1: Don't show context menu for empty sites. r=lucasr
Bug 996850 - Part 2: Don't allow empty "Edit" input. r=lucasr