Code

Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sun, 19 Feb 2012 10:11:28 +0000 (11:11 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 19 Feb 2012 10:11:28 +0000 (11:11 +0100)
commit3904b4b9fd1a53c93f31d8fec709a7b7b8300513
tree2811913611abb933adfe42aa6e37681b7601d3b5
parentd0bb20feb1c5915e8b8af24cc2d46c4ac82d6704
parent8a81e4d5907c43d22a808dbfe088eb4ddab2a16b
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
version-gen.sh

Change-Id: Id72b28eb1432835ab710d1f551bb886d0638e079
ChangeLog
configure.in
src/exec.c
src/network.c