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)
commita3a6b30d1093113db6b909f833570e1574e8b454
tree4dbf720ce040ea0b3816e65e052c26e021ad2be4
parentfdc2359e4515dfa50048b3b6cd4896ef4744cc5f
parentfba215a69da02a97f5132671c43a2cc6a5a2c2d1
Merge "Drop deprecated templates/Makefile/merge.py"