diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
| commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
| tree | 258514dac7faab41642d8f319eb113c8a5f09690 /lisp/erc/ChangeLog.06 | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.bz2 emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/erc/ChangeLog.06')
| -rw-r--r-- | lisp/erc/ChangeLog.06 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06 index a1a196b79aa..3f69f164e08 100644 --- a/lisp/erc/ChangeLog.06 +++ b/lisp/erc/ChangeLog.06 @@ -1430,7 +1430,7 @@ See ChangeLog.05 for earlier changes. - Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. |