Commit from Mozilla Verbatim by user ouesten.: 4925 of 4925 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user markh@babelzilla.org.: 4925 of 4925 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Merge branch 'master' of ssh://github.com/mozilla/zamboni
remove request.DESKTOP uses
add wrapper util for get_app_info
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 4925 of 4925 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Commit from Mozilla Verbatim by user jasnapaka@jasnapaka.com.: 4833 of 4925 strings translated (0 fuzzy).
Don't dump out html for unhandled errors (bug 1000992)
Update settings to include WHITELISTED_CLIENTS_EMAIL_API, POSTFIX_AUTH_TOKEN, POSTFIX_DOMAIN
Merge pull request #1992 from muffinresearch/verify-check-error-1000992

Don't dump out html for unhandled errors (bug 1000992)
update legal docs
remove apps/discovery/ (bug 999130)
bump requests
Merge pull request #1993 from andymckay/bump-requests

bump requests