Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 13d9fee edacee3)
Merge "merge.py use a class to represent template syntax"
authorJenkins <jenkins@review.openstack.org>
Tue, 22 Jul 2014 03:46:25 +0000 (03:46 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 22 Jul 2014 03:46:25 +0000 (03:46 +0000)

Trivial merge