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
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Add DATABASE_POOL_ARGS to prod settings.
Merge pull request #1845 from jasonthomas/prod-db-settings

Add DATABASE_POOL_ARGS to prod settings.
Changed charset + fixes for IARC updates
Merge pull request #1846 from koehlermichael/master

Changed charset + fixes for IARC updates
Merge branch 'master' of ssh://github.com/mozilla/zamboni
match up the uuid for zippy
Don't make the same ES query twice if there are no results (bug 975102)
Merge pull request #1831 from diox/es-no-results-count

Don't make the same ES query twice if there are no results (bug 975102)
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Fix AMO stats following ES 1.0 preparation
Fix mkt.fireplace.tests.test_api:TestSearchView.test_anonymous_user
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)