summaryrefslogtreecommitdiff
path: root/lisp/erc/ChangeLog.04
diff options
context:
space:
mode:
authorjave <joakim@verona.se>2015-01-02 16:30:55 +0100
committerjave <joakim@verona.se>2015-01-02 16:30:55 +0100
commitdb4613576d3115aa320f0293d081ce98baa06acd (patch)
tree829968643b451bd3f64c791e4d3a6c928010e14c /lisp/erc/ChangeLog.04
parentc089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff)
parentd0ca1148fe2d1e72e86f0197731071f139c143e3 (diff)
downloademacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz
merge master
Diffstat (limited to 'lisp/erc/ChangeLog.04')
-rw-r--r--lisp/erc/ChangeLog.042
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.