[python-django-secure/el6: 2/2] Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-django-secure into el6

[Matthias Runge]

commit b59633a6bbb4cdb8c919590f3da9414981abecee
Merge: dd6a945 c0f502f
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed Aug 28 08:45:06 2013 +0200

    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-django-secure into el6
    
    Conflicts:
    	python-django-secure.spec

---