From: Clint Byrum <clint@fewbar.com>
Date: Wed, 8 May 2013 23:01:42 +0000 (+0000)
Subject: Merge github.com:SpamapS/templates
X-Git-Tag: opnfv-6.0.0~3037
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b4f7eae590bfea841db3099c4dba1160fb2f6d27;p=apex-tripleo-heat-templates.git

Merge github.com:SpamapS/templates

Conflicts:
	generic-user.yaml
---

b4f7eae590bfea841db3099c4dba1160fb2f6d27