From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 22 Jul 2014 03:46:25 +0000 (+0000)
Subject: Merge "merge.py use a class to represent template syntax"
X-Git-Tag: opnfv-6.0.0~2800
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=719b82a658740b7a321ae6b81e13206bd096539b;p=apex-tripleo-heat-templates.git

Merge "merge.py use a class to represent template syntax"
---

719b82a658740b7a321ae6b81e13206bd096539b