diff options
| author | Daniel Colascione | 2012-10-07 14:31:58 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-10-07 14:31:58 -0800 |
| commit | 36a305a723c63fd345be65c536c52fe9765c14be (patch) | |
| tree | fb89d9e103552863214c60297a65320917109357 /lisp/erc/erc-replace.el | |
| parent | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (diff) | |
| parent | 795b1482a9e314cda32d62ac2988f573d359366e (diff) | |
| download | emacs-36a305a723c63fd345be65c536c52fe9765c14be.tar.gz emacs-36a305a723c63fd345be65c536c52fe9765c14be.zip | |
Merge from trunk
Diffstat (limited to 'lisp/erc/erc-replace.el')
| -rw-r--r-- | lisp/erc/erc-replace.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el index 6c5804c62a4..3d4a5d311b1 100644 --- a/lisp/erc/erc-replace.el +++ b/lisp/erc/erc-replace.el | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | ;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Andreas Fuchs <asf@void.at> | 5 | ;; Author: Andreas Fuchs <asf@void.at> |
| 6 | ;; Maintainer: Mario Lang (mlang@delysid.org) | 6 | ;; Maintainer: FSF |
| 7 | ;; Keywords: IRC, client, Internet | 7 | ;; Keywords: IRC, client, Internet |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |