summaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge
AgeCommit message (Expand)AuthorFilesLines
2013-12-17Make merge.py installable as a package using pbrmarios2-0/+224