Code

Merge branch 'collectd-4.1'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:59:29 +0000 (18:59 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:59:29 +0000 (18:59 +0200)
commit83149d73b8a3bd4889517a2e4d0adca0a52e7a06
treeea6d86f4b552cc972f7007de2706893eecde647b
parent302d7eef72758ec38f28e926480df115ea38f72a
parent6ba1a320cc3ee1c133eaf733ab8fd67b5b247115
Merge branch 'collectd-4.1'

Conflicts:

ChangeLog
ChangeLog
README
src/collectd.conf.in
src/collectd.conf.pod