Merge lp://staging/~yolanda.robla/horizon/precise-security into lp://staging/ubuntu/precise-security/horizon

.bzrignore (+0/-12)
.mailmap (+0/-8)
.pc/CVE-2012-3540.patch/horizon/views/auth_forms.py (+0/-190)
.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/dashboard.py (+0/-31)
.pc/add_juju_settings_panel.patch/openstack_dashboard/local/local_settings.py.example (+0/-117)
.pc/allow_alternate_css.patch/horizon/templatetags/branding.py (+0/-62)
.pc/allow_alternate_css.patch/openstack_dashboard/templates/_stylesheets.html (+0/-6)
.pc/applied-patches (+0/-9)
.pc/fix-coverage-binary-name.patch/run_tests.sh (+0/-403)
.pc/fix-dashboard-django-wsgi.patch/openstack_dashboard/wsgi/django.wsgi (+0/-15)
.pc/fix-dashboard-manage.patch/manage.py (+0/-12)
.pc/juju_panel-handle_catalog_exception.patch/horizon/dashboards/settings/juju/forms.py (+0/-96)
.pc/turn-off-debug.patch/openstack_dashboard/local/local_settings.py.example (+0/-123)
.pc/use-memcache.patch/openstack_dashboard/local/local_settings.py.example (+0/-123)
.pylintrc (+0/-42)
AUTHORS (+2/-0)
PKG-INFO (+126/-0)
debian/changelog (+18/-0)
debian/patches/CVE-2012-3540.patch (+0/-33)
debian/patches/series (+0/-1)
horizon.egg-info/PKG-INFO (+126/-0)
horizon.egg-info/SOURCES.txt (+478/-0)
horizon.egg-info/dependency_links.txt (+3/-0)
horizon.egg-info/not-zip-safe (+1/-0)
horizon.egg-info/requires.txt (+18/-0)
horizon.egg-info/top_level.txt (+2/-0)
horizon/dashboards/nova/images_and_snapshots/images/tables.py (+3/-0)
horizon/dashboards/nova/instances_and_volumes/volumes/tables.py (+1/-1)
horizon/dashboards/settings/juju/__init__.py (+0/-1)
horizon/dashboards/settings/juju/forms.py (+0/-96)
horizon/dashboards/settings/juju/panel.py (+0/-28)
horizon/dashboards/settings/juju/urls.py (+0/-24)
horizon/dashboards/settings/juju/views.py (+0/-28)
horizon/dashboards/settings/templates/settings/juju/download_form.html (+0/-20)
horizon/dashboards/settings/templates/settings/juju/environments.yaml.template (+0/-21)
horizon/dashboards/settings/templates/settings/juju/index.html (+0/-11)
horizon/usage/base.py (+9/-6)
horizon/version.py (+1/-1)
setup.cfg (+5/-0)
tools/pip-requires (+1/-1)
tox.ini (+0/-26)