[python-django-tastypie/el6: 8/8] Merge branch 'master' into el6

[Miro Hrončok]

commit d94b03f2132a9ad49062dc47fc35851a19cc4602
Merge: 8cb72d0 e8fd1e7
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Sat Mar 30 17:52:13 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-django-tastypie.spec
    	sources

 .gitignore                              |    7 +-
 python-django-tastypie-django-1.5.patch |  316 +++++++++++++++++++++++++++++++
 python-django-tastypie.spec             |   71 ++++---
 sources                                 |    4 +-
 4 files changed, 362 insertions(+), 36 deletions(-)
---