Code

Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@noris.net>
Wed, 21 Apr 2010 17:04:01 +0000 (19:04 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 21 Apr 2010 17:04:01 +0000 (19:04 +0200)
commitd48a9456e42af4ab5881ab055c95ceab71819bc1
tree0e5e790c278bd96b7ffa5ff5a96d22f91bee77ae
parent07be522384e753b7921213a0dc96a50336c79a66
parenta841b5f2882acf431f4fd0783f602f3ae80716c5
Merge branch 'collectd-4.8' into collectd-4.9

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