Merge from origin/emacs-24

[gnu-emacs] / doc / misc / emacs-mime.texi

diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 36ea0b2cac62ab84d80ae7c692bcf6305f5da3cd..0147db34fffed2fd171d605a83078afdccef4268 100644 (file)
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -11,7 +11,7 @@
 @copying
 This file documents the Emacs MIME interface functionality.
 
-Copyright @copyright{} 1998--2014 Free Software Foundation, Inc.
+Copyright @copyright{} 1998--2015 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document