commit 4b9f6d90c7963aba91458cbaef89feff5377633f Merge: 654ef51 9f78f34 Author: Matthias Runge <mrunge at redhat.com> Date: Fri Mar 8 13:53:00 2013 +0100 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-horizon ---