From: Jeff Peeler <jpeeler@redhat.com>
Date: Thu, 12 Apr 2012 22:32:48 +0000 (-0400)
Subject: Merge branch 'master' of github.com:heat-api/heat
X-Git-Tag: 2014.1~2040
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ec794e6d4a3777a89a0136bd397abfffb3dfd485;p=openstack-build%2Fheat-build.git

Merge branch 'master' of github.com:heat-api/heat
---

ec794e6d4a3777a89a0136bd397abfffb3dfd485