[python-django-horizon/f17: 8/8] Merge branch 'master' into f17

[Pádraig Brady]

commit a1669d9dc25d537144adffdfdb29860e18c26b33
Merge: cda60ae 3bb3722
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sat May 5 01:18:55 2012 +0100

    Merge branch 'master' into f17

 CVE-2012-2144-session_fixation.patch |  155 ++++++++++++++++++++++++++++++++++
 python-django-horizon.spec           |    9 ++-
 2 files changed, 162 insertions(+), 2 deletions(-)
---