1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00

Merge from emacs-24; up to 2012-12-02T06:22:32Z!cyd@gnu.org

This commit is contained in:
Glenn Morris 2012-12-22 11:09:52 -08:00
commit 00afe3a454
74 changed files with 620 additions and 585 deletions

View file

@ -9,7 +9,7 @@
@copying
This manual is for ERC as distributed with Emacs @value{EMACSVER}.
Copyright @copyright{} 2005-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2005--2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document