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

Merged and Committed by mrunge 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-appconf
    
    Conflicts:
    	python-django-appconf.spec
    
        
file modified
+3 -0