Don't include the country choices in migration operations.
Merge pull request #58 from schinckel/feature/django1.7

Don't include the country choices in migration operations.
Update patch from HEAD.