log lisp/ChangeLog @ 5246:bf93bff989d8

age author description
Fri, 20 Aug 2010 11:35:58 +0200 Mike Sperber Recover from merge SNAFU.