Merge lp:~corey.bryant/horizon/2014.1.4-0ubuntu2 into lp:~ubuntu-server-dev/horizon/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-19 08:59:10 +0000
+++ debian/changelog	2015-03-29 19:22:05 +0000
@@ -1,3 +1,9 @@
+horizon (1:2014.1.4-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/control: Set minimum python-six dependency to 1.5.2 (LP: #1403114).
+
+ -- Corey Bryant <[e-mail]>  Sun, 29 Mar 2015 14:53:18 -0400
+
 horizon (1:2014.1.4-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (b14a2ec) (LP: #1432608):
 
=== modified file 'debian/control'
--- debian/control	2014-02-25 14:41:37 +0000
+++ debian/control	2015-03-29 19:22:05 +0000
@@ -12,6 +12,7 @@
  python-nose,
  python-pbr,
  python-setuptools,
+ python-six (>= 1.5.2),
  python-sphinx
 Standards-Version: 3.9.3
 Homepage: http://launchpad.net/horizon
@@ -36,6 +37,7 @@
  python-neutronclient,
  python-novaclient,
  python-openstack-auth (>= 1.1.1),
+ python-six (>= 1.5.2),
  python-swiftclient,
  python-troveclient,
  python-tz,