Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index df882c8..37c72a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -169,7 +169,7 @@
        * v5upgrade target: Target for converting v4 data sets to the v5
          schema.
 
-2012-03-23, Version 4.10.7
+2012-04-01, Version 4.10.7
        * Build system: Fix the use of a libltdl macro. Thanks to Clemens Lang
          for fixing this. Adresses some issues with building the iptables
          plugin under Gentoo.