]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/heat into debian...
authorThomas Goirand <thomas@goirand.fr>
Sat, 3 May 2014 07:02:01 +0000 (07:02 +0000)
committerThomas Goirand <thomas@goirand.fr>
Sat, 3 May 2014 07:02:01 +0000 (07:02 +0000)
Conflicts:
debian/changelog

Rewritten-From: 50761deeb793d393bb411707ef55d8de4d0bfe3f


Trivial merge