1 files changed, 26 insertions, 3 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3558a8a90b5..8b4df6099bc 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,27 @@
+2012-10-07  Deniz Dogan  <deniz@dogan.se>
+
+        * erc-log.el (erc-generate-log-file-name-function):
+        Clarify tags for various choices.  (Bug#11186)
+
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * erc-button.el (erc-button-alist): Remove "finger".  (Bug#4443)
+
+2012-10-07  Antoine Levitt  <antoine.levitt@gmail.com>
+
+        * erc-stamp.el (erc-format-timestamp): Don't apply intangible
+        property to invisible stamps.  (Bug#11706)
+
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * erc-backend.el (NICK): Handle pre-existing buffers.  (Bug#12002)
+
+2012-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * erc.el (erc-lurker):
+        * erc-desktop-notifications.el (erc-notifications):
+        Add missing group :version tags.
+
 2012-10-04  Julien Danjou  <julien@danjou.info>
 
         * erc-desktop-notifications.el: Rename from erc-notifications to
@@ -9,8 +33,7 @@
 
 2012-09-17  Chong Yidong  <cyd@gnu.org>
 
-        * erc-page.el (erc-page-function): 
-
+        * erc-page.el (erc-page-function):
         * erc-stamp.el (erc-stamp): Doc fix.
 
 2012-08-21  Josh Feinstein <jlf@foxtail.org>
@@ -103,7 +126,7 @@
         (erc-autojoin-after-ident): Ditto.
         (erc-autojoin-channels-alist): Mention auth-source.
 
-2012-04-10  Deniz Dogan  <deniz@dogan.se>  (tiny change)
+2012-04-10  Deniz Dogan  <deniz@dogan.se>
 
         * erc.el (erc-display-prompt): Adds the field text property to the
         ERC prompt.  This allows users to use `kill-whole-line' to kill