Merge from emacs-24

[gnu-emacs] / lisp / gnus / ChangeLog

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7e6137226b5de1e73616f78a4e11496d0f083afc..be60d7777c4bc1484a43419913cff82dfbfa3492 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-02  Daiki Ueno  <ueno@gnu.org>
+
+       * mml.el (mml-parse-1): Error out if unknown mode is specified in
+       <#secure> tag (bug#18513).
+
 2014-09-29  Daiki Ueno  <ueno@gnu.org>
 
        * mml.el (mml-parse-1): Error out if unknown mode is specified in