Merge "Move os-apply-config templates into a directory"
authorJenkins <jenkins@review.openstack.org>
Wed, 7 Oct 2015 22:03:10 +0000 (22:03 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 7 Oct 2015 22:03:10 +0000 (22:03 +0000)

Trivial merge