diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/erc/ChangeLog | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/erc/ChangeLog')
| -rw-r--r-- | lisp/erc/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 847b995997c..0366addacfc 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -449,7 +449,7 @@ | |||
| 449 | 449 | ||
| 450 | See ChangeLog.08 for earlier changes. | 450 | See ChangeLog.08 for earlier changes. |
| 451 | 451 | ||
| 452 | Copyright (C) 2009-2012 Free Software Foundation, Inc. | 452 | Copyright (C) 2009-2013 Free Software Foundation, Inc. |
| 453 | 453 | ||
| 454 | This file is part of GNU Emacs. | 454 | This file is part of GNU Emacs. |
| 455 | 455 | ||