Merge "Drop deprecated templates/Makefile/merge.py"
authorJenkins <jenkins@review.openstack.org>
Tue, 1 Dec 2015 22:46:44 +0000 (22:46 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 1 Dec 2015 22:46:44 +0000 (22:46 +0000)

Trivial merge