Merge remote branch 'origin/no-gnus'
authorLars Magne Ingebrigtsen <larsi@gnus.org>
Wed, 14 Mar 2012 18:03:30 +0000 (19:03 +0100)
committerLars Magne Ingebrigtsen <larsi@gnus.org>
Wed, 14 Mar 2012 18:03:30 +0000 (19:03 +0100)
commit9f6c66f015b581961a17e95720b753d10d772677
treefbe7d683680f9cfa7138cb0446f4eabf57b10bf3
parent0cd494a72be81805c59bbda60fe270f649eadd28
parent333f5fb73e2fb37bbd91cc23461ac7ba58e197d0
Merge remote branch 'origin/no-gnus'
lisp/ChangeLog
lisp/shr.el