aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc/erc-replace.el
diff options
context:
space:
mode:
authorjave2015-01-02 16:30:55 +0100
committerjave2015-01-02 16:30:55 +0100
commitdb4613576d3115aa320f0293d081ce98baa06acd (patch)
tree829968643b451bd3f64c791e4d3a6c928010e14c /lisp/erc/erc-replace.el
parentc089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff)
parentd0ca1148fe2d1e72e86f0197731071f139c143e3 (diff)
downloademacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz
emacs-db4613576d3115aa320f0293d081ce98baa06acd.zip
merge master
Diffstat (limited to 'lisp/erc/erc-replace.el')
-rw-r--r--lisp/erc/erc-replace.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index 5eb3338b73e..db9ac9dfc58 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -1,6 +1,6 @@
1;; erc-replace.el -- wash and massage messages inserted into the buffer 1;; erc-replace.el -- wash and massage messages inserted into the buffer
2 2
3;; Copyright (C) 2001-2002, 2004, 2006-2014 Free Software Foundation, 3;; Copyright (C) 2001-2002, 2004, 2006-2015 Free Software Foundation,
4;; Inc. 4;; Inc.
5 5
6;; Author: Andreas Fuchs <asf@void.at> 6;; Author: Andreas Fuchs <asf@void.at>