Merge from emacs-24; up to 2012-12-14T15:38:50Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 847b995..bbe551c 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * erc-dcc.el (erc-dcc-send-file): Use point-min-marker.
+       (erc-dcc-chat-setup): Use point-max-marker.
+
+2013-01-04  Glenn Morris  <rgm@gnu.org>
+
+       * erc-backend.el (312): Fix typo.  (Bug#13235)
+
 2012-11-30  Glenn Morris  <rgm@gnu.org>
 
        * erc.el (erc-accidental-paste-threshold-seconds): Add :version.
@@ -449,7 +458,7 @@
 
 See ChangeLog.08 for earlier changes.
 
-       Copyright (C) 2009-2012 Free Software Foundation, Inc.
+       Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.