renamed CHANGES-merge.txt to -borg

This commit is contained in:
Thomas Waldmann 2015-05-13 18:45:25 +02:00
parent 31fce54f67
commit a962c19a09