5dcdc72
Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-appconf Conflicts: python-django-appconf.spec