Merge commit
authorLars Magne Ingebrigtsen <larsi@stories.(none)>
Sat, 3 Mar 2012 14:23:33 +0000 (15:23 +0100)
committerLars Magne Ingebrigtsen <larsi@stories.(none)>
Sat, 3 Mar 2012 14:23:33 +0000 (15:23 +0100)
1  2 
lisp/ChangeLog

diff --cc lisp/ChangeLog
Simple merge