From: Thomas Goirand <thomas@goirand.fr>
Date: Thu, 7 Feb 2013 13:25:39 +0000 (+0000)
Subject: Merge branch 'debian/unstable' of ssh://git.debian.org/git/openstack/horizon into... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4703fc4943a6f54da93bab385044c52c9d7826b7;p=openstack-build%2Fhorizon-build.git

Merge branch 'debian/unstable' of ssh://git.debian.org/git/openstack/horizon into debian/unstable

Conflicts:
	debian/changelog

Rewritten-From: 09ef702f063da5ae1b5be297990593c6b9c1fb10
---

4703fc4943a6f54da93bab385044c52c9d7826b7