ChangeLog merge fix
authorGlenn Morris <rgm@gnu.org>
Thu, 31 May 2012 20:06:04 +0000 (16:06 -0400)
committerGlenn Morris <rgm@gnu.org>
Thu, 31 May 2012 20:06:04 +0000 (16:06 -0400)
commitb691b884eeef2ecb8772ac121ab23136b9d9d0d2
treeec897739884f405690c405ce0d8b6dcc305648ae
parent43f5c7ae53b9afbda100ec26758ff0fb3eadfb48
ChangeLog merge fix
lisp/ChangeLog