Merge lp:~corey.bryant/horizon/2013.1.5 into lp:~ubuntu-server-dev/horizon/grizzly

[Corey Bryant]

Ubuntu Stable Release Update for OpenStack Grizzly

[lp:~corey.bryant/horizon/2013.1.5]

156. By Corey Bryant on 2014-03-24

* Resynchronize with stable/grizzly (e6a4653) (LP: #1295674):
  - [e6a4653] Fixing tests to work with keystoneclient 0.6.0
  - [3212dd0] User email is optional and can be absent
  - [117ac2f] Adding management_url to test mock client
  - [b14debc] Fix bug by escaping strings from Nova before displaying them

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-17 21:10:11 +0000
+++ debian/changelog	2014-03-24 14:16:58 +0000
@@ -1,3 +1,13 @@
+horizon (1:2013.1.5-0ubuntu1~cloud0) precise-grizzly; urgency=low
+
+  * Resynchronize with stable/grizzly (e6a4653) (LP: #1295674):
+    - [e6a4653] Fixing tests to work with keystoneclient 0.6.0
+    - [3212dd0] User email is optional and can be absent
+    - [117ac2f] Adding management_url to test mock client
+    - [b14debc] Fix bug by escaping strings from Nova before displaying them
+
+ -- Corey Bryant <[e-mail]>  Fri, 21 Mar 2014 14:32:35 -0400
+
 horizon (1:2013.1.4-0ubuntu1) raring-proposed; urgency=low
 
   * Resynchronize with stable/grizzly (3f81d70) (LP: #1241202):