Merge remote branch 'origin/no-gnus'
authorLars Magne Ingebrigtsen <larsi@gnus.org>
Sun, 10 Jun 2012 19:13:51 +0000 (21:13 +0200)
committerLars Magne Ingebrigtsen <larsi@gnus.org>
Sun, 10 Jun 2012 19:13:51 +0000 (21:13 +0200)
commit935af32fa5a3d22163b9b626d770f5c16a766837
treeb2ea0577b7d755304b898325a0ae7ce35ae97379
parent59403f318f769dc0ff91a59405c4d8d122a10ab6
parentb374ff322d545ea58bb64959c7ffd9a9b15a80b2
Merge remote branch 'origin/no-gnus'
lisp/ChangeLog
lisp/shr.el