Merge changes from emacs-23 branch

[gnu-emacs] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 879dd2285622afe647b80e0db311aad4352d5686..ee81bc486935e788052f149e357a17adf66977fe 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-31  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
+
+       * erc-track.el (track): Don't reset erc-modified-channels-object
+       each time erc-track-mode is activated.
+
 2011-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * erc.el (erc-mode):