Merge from origin/emacs-25

[gnu-emacs] / lisp / erc / ChangeLog.2

diff --git a/lisp/erc/ChangeLog.2 b/lisp/erc/ChangeLog.2
index 8dce5084ec9057011362cc9915609026c540d884..4295b34effdaab4fe0dc644b7ac855f526434177 100644 (file)
--- a/lisp/erc/ChangeLog.2
+++ b/lisp/erc/ChangeLog.2
@@ -1,3 +1,8 @@
+2015-11-07  Kelvin White  <kwhite@gnu.org>
+
+       * erc-pcomplete.el (pcomplete-erc-nicks): Fix bug for tab complete
+       (bug#18771)
+
 2015-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * erc.el (erc-switch-to-buffer): Fix last change (bug#20187).
@@ -752,7 +757,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-  Copyright (C) 2009-2015 Free Software Foundation, Inc.
+  Copyright (C) 2009-2016 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.