diff options
| author | Katsumi Yamaoka | 2010-10-01 00:34:42 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2010-10-01 00:34:42 +0000 |
| commit | 47e088962f2a6a925d8066e4a2722635deda7c97 (patch) | |
| tree | a1584b2b340ff94c34484487846dc45acbb1ea8c /lisp | |
| parent | 6b9588145b7b1cac4e4629f7133bf88f9360c15f (diff) | |
| download | emacs-47e088962f2a6a925d8066e4a2722635deda7c97.tar.gz emacs-47e088962f2a6a925d8066e4a2722635deda7c97.zip | |
Fix previous merge from Gnus trunk.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b93b34a4fcb..07dbc824cd5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | 2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * tls.el (tls-starttls-switches): New variable. | 3 | * net/tls.el (tls-starttls-switches): New variable. |
| 4 | (tls-find-starttls-argument): Use it. | 4 | (tls-find-starttls-argument): Use it. |
| 5 | (open-tls-stream): Ditto. | 5 | (open-tls-stream): Ditto. |
| 6 | 6 | ||
| 7 | 1 * netrc.el (netrc-credentials): Return the value of the "default" | 7 | * net/netrc.el (netrc-credentials): Return the value of the "default" |
| 8 | entry. | 8 | entry. |
| 9 | (netrc-machine): Ditto. | 9 | (netrc-machine): Ditto. |
| 10 | 10 | ||