Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Bug 990606 - [Camera][Madai][l10n] Improve l10n for Camera Settings
Merge pull request #17973 from wilsonpage/bug/990606

Bug 990606 - [Camera][Madai][l10n] Improve l10n for Camera Settings
Bug 930364 - standard text message sound is jarring
Revert "Merge pull request #16262 from benfrancis/959694-master"
Merge pull request #17961 from marshall/ftuPing

Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Merge pull request #17995 from sfoster/backout-959694

Revert "Merge pull request #16262 from benfrancis/959694-master"
Merge pull request #17994 from Rik/sms-sound-930364

Bug 930364 - standard text message sound is jarring r=julienw
Revert "Bug 984572 - JSHint fixes for js/*, js/utils and js/worker."

This reverts commit 1b0f1abf64059b88b33f7312f82d722e33e98cac.

Conflicts:
	build/jshint/xfail.list