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 /doc | |
| parent | 6b9588145b7b1cac4e4629f7133bf88f9360c15f (diff) | |
| download | emacs-47e088962f2a6a925d8066e4a2722635deda7c97.tar.gz emacs-47e088962f2a6a925d8066e4a2722635deda7c97.zip | |
Fix previous merge from Gnus trunk.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 96522da7343..d40d2f7c397 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | 41 | ||
| 42 | 2010-09-26 Julien Danjou <julien@danjou.info> | 42 | 2010-09-26 Julien Danjou <julien@danjou.info> |
| 43 | 43 | ||
| 44 | * gnus.texi (Oort Gnus): Remove mention of ssl.el | 44 | * gnus.texi (Oort Gnus): Remove mention of ssl.el. |
| 45 | 45 | ||
| 46 | 2010-09-26 Lars Magne Ingebrigtsen <larsi@gnus.org> | 46 | 2010-09-26 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 47 | 47 | ||
| @@ -71,7 +71,7 @@ | |||
| 71 | 71 | ||
| 72 | 2010-09-25 Julien Danjou <julien@danjou.info> | 72 | 2010-09-25 Julien Danjou <julien@danjou.info> |
| 73 | 73 | ||
| 74 | * gnus.texi (Customizing Articles): Remove gnus-treat-translate | 74 | * gnus.texi (Customizing Articles): Remove gnus-treat-translate. |
| 75 | 75 | ||
| 76 | 2010-09-24 Glenn Morris <rgm@gnu.org> | 76 | 2010-09-24 Glenn Morris <rgm@gnu.org> |
| 77 | 77 | ||