Bug 855604 - SearchCountMeasurement2 should wait for nsSearchService to initialize asynchronously. r=gps
Bug 841554 - Follow-up: fix browser_aboutHome.js. r=gps
Bug 841554 - Part 3: follow-up fix for another test failure. r=trivial, a=bustage.
Bug 841554 - Part 3: follow-up fix for another test failure. r=trivial, a=bustage
Merge m-c to s-c.
Merge m-c to s-c.
Bug 855371 - @MOZ_UPDATE_CHANNEL@ in health report prefs. r=gps
Merge m-c to s-c.
Bug 853138 - Follow-up: change category name in tests. r=gps
Merge m-c to s-c.

--HG--
rename : dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_ChildNode-remove.js => dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/ChildNode-remove.js
Bug 859920 - Some TPS tests failed due to removed autoHide pref. r=trivial, a=test-only
Merge m-c to s-c.
Bug 856925 - Sqlite.jsm tests to demonstrate errors. r=gps
Bug 833965 - Sqlite.jsm should support an array of binding parameters. r=gps
Bug 858828 - Avoid missing URI host member when special-casing user agent string for Youtube domains. r=mfinkle
Bug 858828 - Always return desktop user agent if requested, even for Youtube domains. r=mfinkle
Bug 860513 - QI fallback service to nsIPromptFactory in getPrompt. r=mfinkle
Bug 846122 - Handle split multi-track Cues in nestegg.  r=padenot
Bug 854319 - Part 1: Call BeginDecoding before OnDecodeThreadStart; r=cpearce

This is what WMFReader::OnDecodeThreadStart() expects.
Merge mozilla-central into services-central