[python-django-horizon/el6: 2/3] Merge branch 'master' into el6

[Matthias Runge]

commit dce686aabc18e4c73a34b9c6bc3b5e5fc7251426
Merge: 2d2614d 46034f4
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed Nov 14 08:55:35 2012 +0100

    Merge branch 'master' into el6

 python-django-horizon.spec |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)
---