Merge "Deprecate the old mergepy overcloud templates"
authorJenkins <jenkins@review.openstack.org>
Tue, 24 Feb 2015 21:12:50 +0000 (21:12 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 24 Feb 2015 21:12:50 +0000 (21:12 +0000)

Trivial merge