Mercurial > emacs
diff lisp/mail/mailalias.el @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | 4db798bcd48b 376148b31b5e |
children | 61f7601898b1 |
line wrap: on
line diff
--- a/lisp/mail/mailalias.el Fri Jan 14 16:06:17 2011 +0100 +++ b/lisp/mail/mailalias.el Fri Jan 14 12:18:41 2011 -0500 @@ -1,8 +1,7 @@ ;;; mailalias.el --- expand and complete mailing address aliases -;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003, +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail