From: Thomas Goirand <thomas@goirand.fr>
Date: Sat, 3 May 2014 07:02:01 +0000 (+0000)
Subject: Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/heat into debian... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ef21d5e79e14a50f30abab231bdb7989533fe50c;p=openstack-build%2Fheat-build.git

Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/heat into debian/icehouse

Conflicts:
	debian/changelog

Rewritten-From: 50761deeb793d393bb411707ef55d8de4d0bfe3f
---

ef21d5e79e14a50f30abab231bdb7989533fe50c