From: Florian Forster Date: Fri, 10 Oct 2008 07:01:54 +0000 (+0200) Subject: Merge branch 'collectd-4.4' into collectd-4.5 X-Git-Tag: collectd-4.5.1~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2c2e9a297f59c110ddd4adef6293fe80f39f15b7;p=collectd.git Merge branch 'collectd-4.4' into collectd-4.5 --- 2c2e9a297f59c110ddd4adef6293fe80f39f15b7 diff --cc configure.in index 80514893,bc4d3213..c71cfa4e --- a/configure.in +++ b/configure.in @@@ -2814,99 -2597,94 +2821,103 @@@ cat <