Bug 1000766: add a contacts list to the Loop contacts tab. r=Niko,Standard8,paolo
Bug 1069962: add support for Gravatar avatars. r=paolo
Bug 1069965: add a visual separator between available and blocked contacts. r=paolo
Bug 1063561 - Convert Addon Manager telemetry timings to use Components.utils.now(); r=irvingreid
Bug 1068336 - Part 1: Add a slug to avoid caching robocop_testharness.js. r=mcomella
Bug 1068336 - Part 2: Add a slug and headers to avoid caching test JavaScript files. r=mcomella
Merge m-c to fx-team.

--HG--
rename : content/media/mediasource/SourceBuffer.cpp => content/media/mediasource/ContainerParser.cpp
extra : rebase_source : 8e7ce8e6b3b7dd41e6691465e6e65437d694a3ab
Bug 1069569 - Complain about missing test files for all suites. r=mshal

--HG--
extra : rebase_source : 55d571b413d6080f8fdb1e56b419c078d66f31e7
Backing out bug 893276 for causing bug 1058840.
Bug 1054520 - Add ifdef to enable stumbler in nightly. r=nalexander
Bug 1066483 - Drop SVG camelCase mappings filterRes, contentStyleType, contentScriptType and externalResourcesRequired. r=wchen.
Bug 1068123 - Make the MOZ_GCTIMER logs more verbose and readable; r=jonco

--HG--
extra : rebase_source : 010b83f2302c2b10e7ef3d3bb347a9b7b57a51b4
Bug 1067505 - Make nsCategoryManager into a strong memory reporter. r=njn

The nsCategoryManager singleton lives until very late in shutdown, so the unregister always fails.

It is okay to make it a strong reporter because it will always outlive the memory reporter manager anyways.
Backed out changeset a53aa43ab5f4 for Windows build bustage on a CLOSED TREE

--HG--
extra : rebase_source : d3a1aecd8882bc591898684c0a97f8929b7809a9
Bug 997908 - Test patch to make crash stacks better. r=mccr8
Backed out changeset 230ec8030aa7 (bug 1066483) for webplatform test failures.
Bug 1063053 - Add stronger types to WebGL texture code for better debug/compile time checking. r=jgilbert,kamidphish
Back out bug 1067505 for some kind of make package failure.
Backed out changeset 317c684efd2d (bug 997908) for mochitest-e10s leaks.
Backed out changeset 944bd4284ace (bug 1063053) for B2G bustage.