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

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index b8497da,cf4a077..3f8b71c
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,11 +1,16 @@@
 +2010-10-11  Michael Welsh Duggan  <md5i@md5i.com>  (tiny change)
 +
 +      * sieve-manage.el (sieve-manage-open): Allow port names as well as port
 +      numbers.
 +
+ 2010-10-11  Julien Danjou  <julien@danjou.info>
+ 
+       * shr.el (shr-hr-line): Add.
+       (shr-tag-hr): Use shr-hr-line to specify which character to use to
+       display hr lines.
+       (shr-max-columns): Do not change state to nil if we just inserting
+       spaces.
+ 
  2010-10-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
        * gnus-topic.el (gnus-topic-read-group): If after the last group,