Merge from erc--emacs--22

[bpt/emacs.git] / man / ChangeLog

diff --git a/man/ChangeLog b/man/ChangeLog
index 80f0189..c03f678 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-20  Michael Olson  <mwolson@gnu.org>
+
+       * erc.texi: Call this the 5.2 stable pre-release of ERC.
+
 2006-11-18  Chong Yidong  <cyd@stupidchicken.com>
 
        * misc.texi (Interactive Shell): INSIDE_EMACS is set to t,