Clean-up previous feedmail.el merge.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c7038691a32638f4a298e33cef2060f18ed8509b..9fccc2e06f950671689cf6267eab217a96c4837b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-12  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (src, install-arch-indep, bootstrap-clean)
+       (check-declare): Shell portability fixes.  (Bug#8642)
+
+2011-05-09  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * configure.in: Require GnuTLS 2.6.x or higher.
+
 2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use C99's va_copy to avoid undefined behavior on x86-64 GNU/Linux.