aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert2011-05-03 23:13:23 -0700
committerPaul Eggert2011-05-03 23:13:23 -0700
commit53a35e81c90cec67a21bbc8518bc516ed335d756 (patch)
treebdf44bf84d4a2c11efdce99245da34e39cb17041 /doc
parent19548d0861ced228dd0598240a410bf6a720b59e (diff)
parentf330b642bb28e3b9ee5e14ac55c8103e6dcde412 (diff)
downloademacs-53a35e81c90cec67a21bbc8518bc516ed335d756.tar.gz
emacs-53a35e81c90cec67a21bbc8518bc516ed335d756.zip
Merge from mainline.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index defdabc4d8f..ca9dbba9692 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,4 @@
12011-05-03 Peter Münster <pmlists@free.fr> 12011-05-03 Peter Münster <pmlists@free.fr> (tiny change)
2 2
3 * gnus.texi (Summary Buffer Lines): 3 * gnus.texi (Summary Buffer Lines):
4 gnus-summary-user-date-format-alist does not exist. 4 gnus-summary-user-date-format-alist does not exist.