Bug 1038215 - Change FormData.collect() to avoid storing credit card data for Session Restore r=ttaubert
Merge mozilla-central to fx-team
Bug 1035296 - Make protocol.js pass error messages for unknownError; r=past
Bug 1040721 - The search service should provide details for parsing search result URLs. r=gavin
Bug 936851 - Part 1: remove VideoPlayer. r=mfinkle
Bug 936851 - Part 2: delegate to Fennec itself for YouTube video instead of VideoPlayer. r=mfinkle
Bug 1035296 - Part 2, Make protocol.js pass error messages for unknownError; r=past
Bug 1043029 - Add new card background resources. r=eedens
Bug 1018417 - Add duration parameter to ButtonToast. r=margaret
Bug 787975 - Make JSTerm $0 helper work across content processes. r=msucan.

--HG--
extra : rebase_source : b7a3a698effb0b223160fabae5b6f9b0fe820888
Bug 996778 - Remember split console height;r=msucan
Backed out changeset c5be930c66e3 (bug 1035296) for mochitest-dt failures.
Bug 1045085 - Remove main Product Announcements code. r=mcomella
Merge m-c to fx-team. a=merge