diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-02 08:13:04 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-02 08:13:04 -0800 |
commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/erc/erc-button.el | |
parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/erc/erc-button.el')
-rw-r--r-- | lisp/erc/erc-button.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 433ffc05340..24150138e12 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -1,6 +1,6 @@ ;; erc-button.el --- A way of buttonizing certain things in ERC buffers -;; Copyright (C) 1996-2004, 2006-2012 Free Software Foundation, Inc. +;; Copyright (C) 1996-2004, 2006-2013 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Maintainer: FSF |