Fix mis-merged ChangeLog.
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Oct 2018 20:41:47 +0000 (21:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Oct 2018 20:41:47 +0000 (21:41 +0100)
commitc244e637eb0e6d64800f1c916d5e8a772a570143
treef50cbed5aebb79c75ff2857a408880c15fdfcde3
parent34ddf0c18e6dd815d103552bf4013c41bd3a559c
Fix mis-merged ChangeLog.
ChangeLog