Merge branch 'master' into cairo

[gnu-emacs] / lisp / epg-config.el

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 16ed6e1f5c9ea4e4d88e5ef1a755745e2f6a45fa..10f0dd3f4bf79b781d237e1365957d8abc28613d 100644 (file)
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -1,6 +1,6 @@
 ;;; epg-config.el --- configuration of the EasyPG Library
 
-;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG