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
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Remove old 'Amp your firefox contest winners' promo (bug 979731)
Merge branch 'master' of ssh://github.com/mozilla/zamboni
move migrate_activity_Log to limited queue
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Fix AMO stats following ES 1.0 preparation
Merge pull request #1847 from diox/fix-amo-stats-es

Fix AMO stats following ES 1.0 preparation
Merge pull request #1825 from nearlyfreeapps/bug-968474

Removed ADDON_ANY choice for changing add-on types (Bug 970312)
Merge branch 'master' of ssh://github.com/mozilla/zamboni
From Piston to DRF: switching ListView and Search View (bug 977148)

https://bugzilla.mozilla.org/show_bug.cgi?id=977148

Depends on https://github.com/mozilla/zamboni/pull/1749
Merge pull request #1830 from davidbgk/956159-pist2drf-listsearch

From Piston to DRF: switching ListView and SearchView (bug 977148)
Add NEWRELIC_WHITELIST to stage settings.
Add-ons for Australis contest promotion (bug 979731)
Merge pull request #1835 from diox/australis-contest-promo

Add-ons for Australis contest promotion (bug 979731)
Merge pull request #1840 from ngokevin/commmal

move migrate_activity_log to limited queue