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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-16 08:36:19 +0000
+++ debian/changelog	2014-08-08 13:58:55 +0000
@@ -1,3 +1,23 @@
+horizon (1:2014.1.2-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (4a70f4c) (LP: #1354159):
+    - [2b9c566] Import translations for Icehouse stable update
+    - [015f24c] Fix security group modal header overflow
+    - [785a526] Disable broken unit test (related to "Change Password")
+    - [eb3a40a] Replace UserManager with None in tests
+    - [e66fbc3] Sort security group rules by protocol and port
+    - [a855b0c] Avoid AttributeError: SecurityGroup error handle
+    - [937436f] adapt to python-novaclient-2.18.0
+    - [32a7b71] Fix multiple Cross-Site Scripting (XSS) vulnerabilities.
+    - [43ac907] add httplib2 explicitly to requirements.txt
+    - [0b2352e] Prevent error message when creating a user
+    - [765e6d3] Fix issues with importing the Login form
+    - [a29cdbc] Fix formatting of heat exceptions
+    - [b527f22] Image uploads should always happen in the background
+    - [4a70f4c] Fix the dot overlaps with the table border in Availability Zones table
+
+ -- Corey Bryant <[e-mail]>  Fri, 08 Aug 2014 09:50:22 -0400
+
 horizon (1:2014.1.1-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (fbd5b2e) (LP: #1328134):