diff options
author | jave <joakim@verona.se> | 2015-01-02 16:30:55 +0100 |
---|---|---|
committer | jave <joakim@verona.se> | 2015-01-02 16:30:55 +0100 |
commit | db4613576d3115aa320f0293d081ce98baa06acd (patch) | |
tree | 829968643b451bd3f64c791e4d3a6c928010e14c /lisp/erc/ChangeLog.04 | |
parent | c089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff) | |
parent | d0ca1148fe2d1e72e86f0197731071f139c143e3 (diff) | |
download | emacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz |
merge master
Diffstat (limited to 'lisp/erc/ChangeLog.04')
-rw-r--r-- | lisp/erc/ChangeLog.04 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04 index 07f2fa9efdc..43b5a7504a8 100644 --- a/lisp/erc/ChangeLog.04 +++ b/lisp/erc/ChangeLog.04 @@ -2072,7 +2072,7 @@ See ChangeLog.03 for earlier changes. - Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2015 Free Software Foundation, Inc. This file is part of GNU Emacs. |