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 /doc/misc/erc.texi | |
| 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 'doc/misc/erc.texi')
| -rw-r--r-- | doc/misc/erc.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index ccd7ab35a48..cc61cd1ab5b 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | @copying | 9 | @copying |
| 10 | This manual is for ERC as distributed with Emacs @value{EMACSVER}. | 10 | This manual is for ERC as distributed with Emacs @value{EMACSVER}. |
| 11 | 11 | ||
| 12 | Copyright @copyright{} 2005--2012 Free Software Foundation, Inc. | 12 | Copyright @copyright{} 2005--2013 Free Software Foundation, Inc. |
| 13 | 13 | ||
| 14 | @quotation | 14 | @quotation |
| 15 | Permission is granted to copy, distribute and/or modify this document | 15 | Permission is granted to copy, distribute and/or modify this document |