Merge lp:~corey.bryant/horizon/2014.1.3 into lp:~ubuntu-server-dev/horizon/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-30 14:42:41 +0000
+++ debian/changelog	2014-10-03 15:31:37 +0000
@@ -1,8 +1,27 @@
-horizon (1:2014.1.2-0ubuntu1.1) UNRELEASED; urgency=medium
+horizon (1:2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Chris Johnston ]
   * Fix Ubuntu theme dropdown and confirmation button (LP: #1308651).
 
- -- Chris Johnston <[e-mail]>  Thu, 25 Sep 2014 11:14:48 -0400
+  [ Corey Bryant ]
+  * Resynchronize with stable/icehouse (dc8e46f) (LP: #1377136):
+    - [ba524b0] template to rely on the the "id" attribute
+    - [ad2d428] Rename add_error methods: Django 1.7 conflict
+    - [8dfe113] Replace Ceilometer ClientException with HTTPException
+    - [f5e1ff4] Add missing "load url from future" in a container template
+    - [839c53d] Add OS_REGION_NAME to openrc
+    - [737fe40] Set the correct min_disk size when creating volume from image
+    - [a8eeed9] Allow forms to disable autofill in all browsers
+    - [e32a00d] Fix endpoint error when running keystone on apache
+    - [faac9e7] Not able to delete a pseudo-folder via horizon
+    - [b6d6e15] Set python hash seed to 0 in tox.ini
+    - [ba908ae] Fix XSS issue with the unordered_list filter
+    - [9a5894b] Long container names no longer break the page
+    - [c9cb128] TEMPLATE_DIRS must be a tuple
+    - [95dcdae] Proper port for LBaaS members
+    - [dc8e46f] Use default_project_id as user project for keystone v3
+
+ -- Corey Bryant <[e-mail]>  Fri, 03 Oct 2014 10:23:54 -0400
 
 horizon (1:2014.1.2-0ubuntu1) trusty; urgency=medium