Resolve conflict.
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Tue, 31 May 2011 18:59:29 +0000 (20:59 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Tue, 31 May 2011 18:59:29 +0000 (20:59 +0200)
commit47d1ae1c6a92e5bc452ed75c6d1f91f7d398de85
tree5d3339001ecf53d392205bb78444b3ac425d1126
parentf3815ce84c470cbc22114291a1cfe4a5d87c54dc
Resolve conflict.
lisp/ChangeLog