Synch with Emacs trunk.

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 517e387..8638151 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * dns-mode.el (auto-mode-alist): Add entry for .zone files.
+
+2010-05-07  Christian von Roques  <roques@mti.ag>  (tiny change)
+
+       * mml2015.el (mml2015-epg-find-usable-key): Skip disabled key
+       (Bug#5592).
+
 2010-05-07  Julien Danjou  <julien@danjou.info>
 
        * gnus-art.el (gnus-mime-pipe-part): Add optional argument `cmd'; pass