Merge from origin/emacs-24

[gnu-emacs] / lisp / gnus / mml2015.el

diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 941b5ecf7c3491e594e8b9ac67c86336d892bf45..74290f4546998b5d54f7c4653dc49c19aea7ea78 100644 (file)
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -149,7 +149,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 
 (defcustom mml2015-display-key-image t
   "If t, try to display key images."
-  :version "25.1"
+  :version "24.5"
   :group 'mime-security
   :type 'boolean)