Code

Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 8 Nov 2007 18:49:17 +0000 (19:49 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 8 Nov 2007 18:49:17 +0000 (19:49 +0100)
commit613c72c29b5405d7e170ae7fe12611492ecb5fef
tree92b8c36d758fd74b4d140cd812d483f4030999df
parent49bb3bcd390c7b4611ca8f5e6a6f8921802e176b
parent6d17d79f77570f68314ab3c3f63720e361b6af58
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

ChangeLog
contrib/PerlLib/Collectd.pm
version-gen.sh
ChangeLog