Yet more ChangeLog merge fixes
authorGlenn Morris <rgm@gnu.org>
Wed, 9 May 2012 03:30:51 +0000 (20:30 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 9 May 2012 03:30:51 +0000 (20:30 -0700)
commit66b03a53a3218479b93d64857a08b6d4cb5a0f7f
tree429fb5075f0977a75083192acc1ea67b94dc2068
parent482276b8ceb2e3211c3c81310e387ce446fc976f
Yet more ChangeLog merge fixes
doc/emacs/ChangeLog
doc/lispref/ChangeLog
lisp/ChangeLog