Merge branch 'archweb-generic' into master-nomake

Conflicts:
	templates/public/download.html

1 files changed, 2 insertions, 2 deletions

diff --git a/mirrors/migrations/0015_assign_country_codes.py b/mirrors/migrations/0015_assign_country_codes.py
index c1b0f969..5d83e02c 100644
--- a/mirrors/migrations/0015_assign_country_codes.py
+++ b/mirrors/migrations/0015_assign_country_codes.py
@@ -4,12 +4,12 @@ from south.db import db
 from south.v2 import DataMigration
 from django.db import models
 
-from django_countries.countries import OFFICIAL_COUNTRIES
+from django_countries.data import COUNTRIES
 
 class Migration(DataMigration):
 
     def forwards(self, orm):
-        reverse_map = dict((v, k) for k, v in OFFICIAL_COUNTRIES.items())
+        reverse_map = dict((v.upper(), k) for k, v in COUNTRIES.items())
         # add a few special cases to the list that we know might exist
         reverse_map['GREAT BRITAIN'] = 'GB'
         reverse_map['KOREA'] = 'KR'