18ff3a3
Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django Conflicts: python-django.spec