Bug 827294 - [Settings] permission string IDs must not contain colon ':' r=etienne
Revert "Merge pull request #7311 from timdream/settings/sample-format"

This reverts commit 185a9cd5c446fee5bf05f38034a3607d9a7a4082, reversing
changes made to 194062b4e8b17a38247d5417094ab9743bd862b2.
Bug 824625 - Make "Sample Format" label localizable, r=evelyn, pike, a=blocking-basecamp
Bug 826286 - time label should update should wait for moztimechange
Bug 827358 - When visibility change FB favorite contacts are duplicated and mis-rendered
Bug 819947 - No WiFi networks detected during FTU experience. Add more debug. r=vingtetun
Bug 825985 - If we can't parse the settings, use the default ones.
Bug 822779 - [FTE] [Portuguese] Text Overlap in Tutorial screen
Bug 826585 - [email/activesync] Deleting/moving messages causes them to show up twice in the target folder; r=asuth, a=blocking-basecamp
Configure the prod payment provider (bug 824841)

This also removes the mock payment provider
that was in use only for testing.
Bug 803449 - Unidentifiable toggle in the notification bar
Merge pull request #7306 from gordonbrander/ux-2013-01-04-cherry-picked

Ux 2013 01 04 cherry picked
Bug 824690 - [Call log] If a contact has two phone numbers with the same type and carrier it is not possible to distinguish them on the call log.
Bug 827137 - Cost control running with foreground priority when not visible (again). Followup. r=me
Merge pull request #7348 from vingtetun/827137

Bug 827137 - Cost control running with foreground priority when not visi...
Bug 827288 - Pressing home to exit activity picker gets device into busted state
Bug 827647 - Add UA override evangelism bug #s to ua-override-prefs.js. r=vingtetun. a=blocking-basecamp
Merge pull request #7350 from vingtetun/827647

Bug 827647 - Add UA override evangelism bug #s to ua-override-prefs.js. ...
Bug 827501 - replace gallery and settings icons r=vingtetun a=vingtetun
Bug 809645 - better auto-brightness adjustments r=timdream a=vingtetun