Fix merge
authorLars Ingebrigtsen <larsi@gnus.org>
Mon, 13 Feb 2012 10:40:22 +0000 (11:40 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Mon, 13 Feb 2012 10:40:22 +0000 (11:40 +0100)
commitaff2b98c7f720ec251c9da1f857ae39d359b90ba
treeaf24d1249df821b6d7afd7d656ebbb36f115d292
parent331faf118601a6693115666283894b37a5ac847f
Fix merge
lisp/ChangeLog
lisp/shr.el