Resolve conflict.
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Sun, 3 Apr 2011 16:43:08 +0000 (18:43 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Sun, 3 Apr 2011 16:43:08 +0000 (18:43 +0200)
commit81d0af85518767484e38359b24d098bbc76880c4
tree63c8dbf428c74c1e515bb070771efac1ae66eba2
parent60fcfe91c518207e97eb109555e9fc682210e8c6
Resolve conflict.
lisp/ChangeLog