Merge branch 'master' of https://git.gnus.org/gnus

author Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>

Sun, 3 Oct 2010 23:45:39 +0000 (01:45 +0200)

committer Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>

Sun, 3 Oct 2010 23:45:39 +0000 (01:45 +0200)
author Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Sun, 3 Oct 2010 23:45:39 +0000 (01:45 +0200)
committer Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Sun, 3 Oct 2010 23:45:39 +0000 (01:45 +0200)
diff --cc lisp/ChangeLog
Simple merge
diff --cc lisp/shr.el
Simple merge
author	Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
	Sun, 3 Oct 2010 23:45:39 +0000 (01:45 +0200)
committer	Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
	Sun, 3 Oct 2010 23:45:39 +0000 (01:45 +0200)
		1	2
lisp/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/shr.el	patch \|	diff1 \|	diff2 \|	blob \| history