summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-ring.el
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/erc-ring.el
parentc089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff)
parentd0ca1148fe2d1e72e86f0197731071f139c143e3 (diff)
downloademacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz
merge master
Diffstat (limited to 'lisp/erc/erc-ring.el')
-rw-r--r--lisp/erc/erc-ring.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 682585c53bb..de988cc8275 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -1,6 +1,6 @@
;; erc-ring.el -- Command history handling for erc using ring.el
-;; Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: emacs-devel@gnu.org