Code

Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 9 Jul 2010 09:49:31 +0000 (11:49 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 9 Jul 2010 09:49:31 +0000 (11:49 +0200)
commitf6d2b3c2f83808f9f3913bf0220b3e6ad84fe23c
treefb2b4df8f437c1f12c5639662a2890ba2e8a7761
parent96c474f576c721c6d993025b99c55de375552259
parent731838e867501089fcac57518155e1a69d7ef8ea
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
ChangeLog
version-gen.sh
ChangeLog
configure.in
src/plugin.c
version-gen.sh