diff options
| author | Alan Mackenzie <acm@muc.de> | 2017-02-05 16:28:53 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2017-02-05 16:28:53 +0000 |
| commit | d5514332d4a6092673ce1f78fadcae0c57f7be64 (patch) | |
| tree | 1780337154904dcfad8ecfa76614b47c082160dd /lisp/erc/erc-log.el | |
| parent | cecc25c68f5a1834c356e18259aa2af402a70ce1 (diff) | |
| parent | de3336051ef74e0c3069374ced5b5fc7bb9fba15 (diff) | |
| download | emacs-d5514332d4a6092673ce1f78fadcae0c57f7be64.tar.gz | |
Merge branch 'master' into comment-cache
Diffstat (limited to 'lisp/erc/erc-log.el')
| -rw-r--r-- | lisp/erc/erc-log.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el index 61a83b1739d..09cffdcd84c 100644 --- a/lisp/erc/erc-log.el +++ b/lisp/erc/erc-log.el @@ -1,6 +1,6 @@ ;;; erc-log.el --- Logging facilities for ERC. -;; Copyright (C) 2003-2016 Free Software Foundation, Inc. +;; Copyright (C) 2003-2017 Free Software Foundation, Inc. ;; Author: Lawrence Mitchell <wence@gmx.li> ;; Maintainer: emacs-devel@gnu.org |