Merge "Manage tripleo-ui configuration files with puppet"
authorJenkins <jenkins@review.openstack.org>
Wed, 21 Sep 2016 21:00:30 +0000 (21:00 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 21 Sep 2016 21:00:30 +0000 (21:00 +0000)

Trivial merge