Synch with Emacs trunk.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 7 May 2010 23:01:27 +0000 (23:01 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 7 May 2010 23:01:27 +0000 (23:01 +0000)
commita538cde9337f14da3e9e6d95a6677b2e0bf9e03c
treeb92ae349f49c28a9adbf33ef837f69d9ea2294d9
parent2a484da73047c71790f9fc8c3286d20108f515d7
Synch with Emacs trunk.
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).
lisp/ChangeLog
lisp/dns-mode.el
lisp/mml2015.el