Merge remote branch 'origin/no-gnus'
authorLars Magne Ingebrigtsen <larsi@gnus.org>
Wed, 14 Mar 2012 19:03:57 +0000 (20:03 +0100)
committerLars Magne Ingebrigtsen <larsi@gnus.org>
Wed, 14 Mar 2012 19:03:57 +0000 (20:03 +0100)
commit264e5aaaaaff94b53f308363fd4402be837a3f15
treee57bdf3d0decffb3c9e1c4db44e9956c665852b7
parent85df3b08e325e1bd9207087db369d0cbbcf3bb8b
parenta672f837dc481157a0ff41183a38f2b04d8561c2
Merge remote branch 'origin/no-gnus'
lisp/ChangeLog
lisp/shr.el