c3f3a69 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-tastypie

Merged and Committed by churchyard 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-tastypie
    
    Conflicts:
    	.gitignore
    	python-django-tastypie.spec
    	sources
    
        
file modified
+0 -3
file modified
+5 -1