Bug 961498: Prevent ICO decoder from exploding when faced with single-resource ICOs r=rnewman
Backout 4b71e71c27a5 for removing update-settings.ini from installs
Bug 952016 - Part a: Disallow calling nsPIDOMWindow::SetChromeEventHandler on inner windows; r=smaug
Bug 952016 - Part b: Remove unused nsGlobalWindow::GetScriptContextInternal; r=smaug
Bug 952016 - Part c: Avoid a QI in nsGlobalWindow::GetTopWindowRoot; r=smaug
Bug 924160 - Part a: Use mochitest manifests for the tests in dom/imptests; p=gps+Ms2ger r=Ms2ger+gps
Bug 950858: Make cipher suite telemetry code less crash-prone, r=keeler
Bug 952874: Fix telemetry for RSA/DHE key sizes of 1025-1280 bits and fix misspelling, r=keeler
Bug 940973 - Change max version for language packs to deal with the new ESR version numbering. r=glandium
Bug 952810 - Ionmonkey ARM: Fix a corner case, out of bounds array reference, in isNextBranch. r=mjrosenb
Bug 945105 patch 1:  Revert the changes to RestyleManager::ComputeStyleChangeFor from bug 898333, patch 2, since they cause skipping (in addition to the desired skipping) of continuations that do need restyling, in the case of directly restyling an element where continuations have different styles.  r=heycam
Bug 945105 patch 2:  Convert RestyleManager::ComputeStyleChangeFor from while loops to for loops to make it easier to add continue statements to it.  r=heycam
Bug 945105 patch 3:  Replace changes to ComputeStyleChangeFor with a check of GetPrevContinuationWithSameStyle to avoid the duplication in a way that still doesn't break direct restyling of an element whose continuations have different styles.  r=heycam
Bug 945105 patch 4:  Add reftest.  r=heycam

I confirmed that the test fails as expected without the patch, and
passes with the patch.
Bug 961498: Prevent ICO decoder from exploding when faced with single-resource ICOs r=rnewman
Merge m-c to inbound.
Merge m-c to fx-team.
Bug 958376 - |mach valgrind-test|: Add a --suppressions option. r=gps.

--HG--
extra : rebase_source : 2e8e6618bb3b1a68ee25efb4c76acb8e53a5a4b2
Bug 961532 - get rid of win7-specific-but-really-identical inverted Toolbar.png for Australis, r?ttaubert
Bug 931028. Transform matrices when used for painting related things should be in dev pixels and not CSS pixels. r=mattwoodrow