Merge remote branch 'origin/no-gnus'

[gnus] / texi / ChangeLog

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 82f6e36..5d9bb81 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -41,6 +41,14 @@
        * gnus.texi (Archived Messages): Mention gnus-gcc-pre-body-encode-hook
        and gnus-gcc-post-body-encode-hook.
 
+2012-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * epa.texi: New file imported from Emacs.
+
+       * pgg.texi: Remove.
+
+       * Makefile.in: Replace pgg.* with epa.*.
+
 2012-04-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * auth.texi (Secret Service API): Edit further and give examples.