Merge resolved.
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Sat, 27 Nov 2010 14:39:02 +0000 (15:39 +0100)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Sat, 27 Nov 2010 14:39:02 +0000 (15:39 +0100)
commit6a730f61ccd2560a2a97acd09032cb4e9e2dc0cf
treedcf0d738993afc4ae0397ae48393920e578f1fb4
parent02b0a7e7d9a308914c8120ef23084462544a8ba5
Merge resolved.
lisp/ChangeLog