Merge.
commit5d5c2f3d7160a6878e6f20fa46d0dc605dbedeb4
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Sun, 24 Apr 2011 19:13:11 +0000 (24 21:13 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Sun, 24 Apr 2011 19:13:11 +0000 (24 21:13 +0200)
treee881e7fa50032910be4f0c77f19d6b89b23ffdca
parent0657a9fe912e3f5ee15e07766c41ff937279338a
Merge.
lisp/ChangeLog