Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d488f61..b9e9fb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,7 +42,7 @@
          to see how many connections your FTP server has to handle or how
          many outgoing connections your mailserver has open.
 
-2008-12-11, Version 4.1.6
+2008-01-11, Version 4.1.6
        * unixsock plugin: A bug in the unixsock plugin caused it not to set
          the permission on the socket as documented in the manpage. Thanks to
          Evgeny Chukreev for fixing this issue.