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

[Matthias Runge]

commit 46a3b74b702d81a1abd3b4213b59e607e61f3a3f
Merge: 6a273c8 b4354fd
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Dec 2 11:10:17 2013 +0100

    Merge branch 'master' into f20

 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 0002-disable-debug-move-web-root.patch             |    2 +-
 ...file-location-to-tmp-and-also-add-localho.patch |    2 +-
 ...-Add-a-customization-module-based-on-RHOS.patch |    2 +-
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch |    2 +-
 ...olicy-files-and-checks-to-etc-openstack-d.patch |    2 +-
 0007-move-SECRET_KEY-secret_key_store-to-tmp.patch |    2 +-
 0008-fix-up-issues-with-customization.patch        |    2 +-
 ...not-truncate-the-logo-related-rhbz-877138.patch |    2 +-
 ...T_KEYSTORE-to-var-lib-openstack-dashboard.patch |    2 +-
 ...escaping-strings-from-Nova-before-display.patch |   76 ++++++++++++++++++++
 python-django-horizon.spec                         |    7 ++-
 12 files changed, 92 insertions(+), 11 deletions(-)
---