Fix merge glitches in 2 ChangeLog files.
commit2354db7f53c25cfdac1b9436bbc56a54f16253f0
authorEli Zaretskii <eliz@gnu.org>
Mon, 8 Dec 2014 17:10:38 +0000 (8 19:10 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 8 Dec 2014 17:10:38 +0000 (8 19:10 +0200)
treef26f002d2c4732fdf69fe6c88c22c9c5bb2860f0
parent5872f843ff45de150f4b35cbc9b11e9f63c96cf2
Fix merge glitches in 2 ChangeLog files.
ChangeLog
src/ChangeLog