Bug 965712: Part 1 - Use our string matching logic for regexps when possible, r=luke
Merge m-c to m-i
Bug 1005198: Make it easy to create test certificates in GTest tests, r=keeler

--HG--
extra : rebase_source : 0b1ec263a5a1ce1856afb12f11ea4c35c2aa55d0
extra : histedit_source : 40a3a3fc1993de0fcdeb5593a1a1df4dc94832b8
Bug 1005208: Rename issuerKeyHash to keyHash in mozilla::pkix's pkixocsp.cpp, r=mmc

--HG--
extra : rebase_source : ede4ed17cb56e3e52325ecadc2c5ded33c4a6013
extra : histedit_source : b727000e81bbc8afa6b9f8188b97065f59da45ad
Bug 1005256: Improve parameter validation in mozilla::pkix::der::Input::GetSECItem, r=mmc

--HG--
extra : rebase_source : 93b65e103c86747ddaf463e639aacffdf7ccb08f
extra : histedit_source : 10ef0ab13fb9de710ea3c589600db4632f9cf4a0
Bug 1005309, Part 1: Improve type conversion and error checking for hashing done in mozilla::pkix's pkixocsp.cpp. r=mmc

--HG--
extra : rebase_source : 79c248ebc45d722249ae7adbbd2527dc9985f6f0
extra : histedit_source : 8ea66942cec4252d9d7e625da22b5ad9964485a1
Bug 1005309, Part 2: Enable extended compiler warnings (-W4 -Wall) in mozilla::pkix, r=mmc

--HG--
extra : rebase_source : 033574a0b26582753baec003becfaf15bbd85003
extra : histedit_source : 2d52c47f92b8f694203c2eb580b37be78ccf2f9c
Bug 1005298 - Add layout.display-list.dump Preference. r=mattwoodrow
Bug 1005328 - Layers.dump output should be consistent with newlines. r=bottond
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

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

Bug 1005311 - Update css error count

========

https://hg.mozilla.org/integration/gaia-central/rev/69741d5406b6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1005311 - Update css error count
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/da85955beafd
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #18749 from EverythingMe/bug1002470

[Bug 1002470] Support for extra page on left [r=ranbena]

========

https://hg.mozilla.org/integration/gaia-central/rev/1fea6cc32dc5
Author: Amir Nissim <amirnissim@gmail.com>
Desc: [Bug 1002470] Support for extra page on left [r=ranbena]
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bug 985304 part 0: Drop "running" prefix on variable 'runningFlexWeightSum', for clarity. r=mats
Bug 985304 part 1: Shorten "flex weight" to "weight" in variable & function names. r=mats

The phrase "flex weight" used to be a term defined in the spec, but it's
long-since been replaced with "flex factor" and "scaled flex factor".

I'm now using the term "weight" to mean "flex factor, with any necessary scaling already done, ready to be used as a weight for apportioning free space".

I'm dropping the "flex" modifier from "flex weight" both for brevity & to make
it more clearly-distinguishable from actual "flex factor" usages in the code.
Bug 985304 part 2: Make flex algorithm gracefully handle flex factors that sum to < 1. r=mats

When our flexibilities sum to a fraction < 1, we clamp the free space to be no
greater than that same fraction of the original free space. This effectively
makes us treat a flexibility of e.g. "0.01" as "1% of the original free space"
in that sort of situation (while still treating it as a normal flex factor if
the sum of the flex factors is greater than 1).
Bug 985304 part 3: Extend flexbox layout mochitest to cover cases with flex values that sum to less than 1. f=mats
Bug 996945: Remove prohibition on flex-grow & flex-shrink properties transitioning between 0 and other values. r=mats