[python-django-bootstrap-toolkit: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-bootstrap-toolkit

[Matthias Runge]

commit 8fb9667afd71216ec2f6c93c164427a8b7636451
Merge: c4472f2 1355b0a
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Jan 17 09:21:27 2013 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-bootstrap-toolkit
    
    Conflicts:
    	python-django-bootstrap-toolkit.spec

---