From: Florian Forster <octo@collectd.org>
Date: Sun, 1 Apr 2012 10:07:09 +0000 (+0200)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.0.4^0
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=f1ba2733d2c58fed90c13e9ae31cb7c1f3c5613e;hp=5cf091d2e55d6904c2989f6d36e97cf12342b139

Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
	ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index df882c81..37c72a64 100644
--- 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.