[python-django-horizon/el6: 2/2] Merge branch 'f18' into el6 update to latest stable version 2012.2.1

[Matthias Runge]

commit f9b00c3afa63355f232e0e0b09a551c58943f8f7
Merge: 285b3cb 9752a51
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Dec 3 09:37:14 2012 +0100

    Merge branch 'f18' into el6
    update to latest stable version 2012.2.1

 .gitignore                 |    1 +
 python-django-horizon.spec |    7 +++++--
 sources                    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---