From: Thomas Goirand <thomas@goirand.fr>
Date: Thu, 17 Apr 2014 17:06:06 +0000 (+0000)
Subject: Merge branch 'debian/icehouse' of ssh://git.gplhost.com/var/cache/git/openstack/cinde... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7b074898efc48c422f44939b5ec3ef1577199441;p=openstack-build%2Fcinder-build.git

Merge branch 'debian/icehouse' of ssh://git.gplhost.com/var/cache/git/openstack/cinder into debian/icehouse

Conflicts:
	debian/changelog

Rewritten-From: 355f68c8de4bd0bde7975f0d165f6c3774bd13b0
---

7b074898efc48c422f44939b5ec3ef1577199441