Fix previous merge from Gnus trunk.

This commit is contained in:
Katsumi Yamaoka 2010-10-01 00:34:42 +00:00
parent 6b9588145b
commit 47e088962f
2 changed files with 4 additions and 4 deletions

View file

@ -41,7 +41,7 @@
2010-09-26 Julien Danjou <julien@danjou.info>
* gnus.texi (Oort Gnus): Remove mention of ssl.el
* gnus.texi (Oort Gnus): Remove mention of ssl.el.
2010-09-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
@ -71,7 +71,7 @@
2010-09-25 Julien Danjou <julien@danjou.info>
* gnus.texi (Customizing Articles): Remove gnus-treat-translate
* gnus.texi (Customizing Articles): Remove gnus-treat-translate.
2010-09-24 Glenn Morris <rgm@gnu.org>

View file

@ -1,10 +1,10 @@
2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* tls.el (tls-starttls-switches): New variable.
* net/tls.el (tls-starttls-switches): New variable.
(tls-find-starttls-argument): Use it.
(open-tls-stream): Ditto.
1 * netrc.el (netrc-credentials): Return the value of the "default"
* net/netrc.el (netrc-credentials): Return the value of the "default"
entry.
(netrc-machine): Ditto.