Removed ADDON_ANY choice for changing add-on types (Bug 970312)
Commit from Mozilla Verbatim by user yfdyh000.: 4914 of 4914 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Make fireplace featured search fully anonymous (bug 975413)
Make S's value_dict Elasticsearch 1.0 compatible

With Elasticsearch 1.0, any time you query with `fields` the values
always come back as lists. This assumes this everywhere and forces it
for Elasticsearch < 1.0 to be consistent.
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Remove old 'Amp your firefox contest winners' promo (bug 979731)
Merge pull request #1822 from diox/fireplace-api-search-anonymous

Make fireplace featured search fully anonymous (bug 975413)
Stop requiring permission to set region=None in search (bug 975413)
Merge pull request #1821 from diox/no-region-for-old-men

Stop requiring permission to set region=None in search (975413)
Added amo.LOG.ESCALATION to ACTION_MAP

new log type added in https://github.com/mozilla/zamboni/pull/1782
Merge branch 'master' of ssh://github.com/mozilla/zamboni
add zh-CN
Merge pull request #1836 from eviljeff/patch-4

Added amo.LOG.ESCALATION to ACTION_MAP
Merge pull request #1838 from clouserw/lang

add zh-CN
Update German L10n (for IARC) (bug 980058)
Merge pull request #1839 from ngokevin/iarcgerman

Update German L10n (for IARC) (bug 980058)
move migrate_activity_Log to limited queue
Merge branch 'master' of ssh://github.com/mozilla/zamboni
upgrade jingo to 0.7 (again: reverts the revert in 61c4359) (bug 976727)