0981e23 Merge branch 'master' into f19

Merged and Committed by churchyard 11 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	python-django-tastypie.spec
    	sources
    
        
file modified
+2 -5
file modified
+41 -28
file modified
+2 -2