Resolve merge conflict.
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 30 Mar 2011 16:10:33 +0000 (18:10 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 30 Mar 2011 16:10:33 +0000 (18:10 +0200)
commitd7a53355e2299eecd6d80014cc2561ca20613ab9
treee3ad0f1d670a8d694c55f4333bfcc3d07bcbe04d
parent06f8178fff242510622829d31a4c994c46724c1d
Resolve merge conflict.
lisp/ChangeLog