19aab37 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django

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