ChangeLog merge fixes
authorGlenn Morris <rgm@gnu.org>
Mon, 14 May 2012 16:11:24 +0000 (09:11 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 14 May 2012 16:11:24 +0000 (09:11 -0700)
commit2f4cadd1da7b681171c60fab8499f23f37ce4cb2
tree0091b84465c7a70fa75a64b1d5fc9f294581df5a
parentd372248073cecc1d8ae1d6bed826692eab16274d
ChangeLog merge fixes
doc/misc/ChangeLog
lisp/ChangeLog