From: Clint Byrum <clint@fewbar.com>
Date: Tue, 7 May 2013 04:10:57 +0000 (+0000)
Subject: Merge branch 'FIX-GENERIC'
X-Git-Tag: opnfv-6.0.0~3042
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a25d96951683a56a908c8a79074945fbe4b83f70;p=apex-tripleo-heat-templates.git

Merge branch 'FIX-GENERIC'
---

a25d96951683a56a908c8a79074945fbe4b83f70