1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 47d0ca810..bd8b0178a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-17  Werner Koch  <[email protected]>
+
+	* THANKS: Merged with the 1.4 one.
+
+2006-08-16  Werner Koch  <[email protected]>
+
+	* configure.ac: Removed test for capabilities and mlock.
+
 2006-08-15  Werner Koch  <[email protected]>
 
 	* Makefile.am (keyserver): Enable building of keyserver helpers.