Code

Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sat, 21 Jan 2012 12:07:50 +0000 (13:07 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 21 Jan 2012 12:07:50 +0000 (13:07 +0100)
commit488c2ca9e3f6f6082f192bdd5d737c6cd1298ba2
tree3b6901de4affc07cc406dbb512ac224870093f0e
parent3b9261df9f7426c4b823a801671aaaba30fda6d9
parentdf920b8327302ac74385d34dae671d988c752495
Merge branch 'collectd-4.10' into collectd-5.0

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

Change-Id: Id7a31088cdb3371534d5c1e6a690464f3343543d
AUTHORS
ChangeLog
src/collectd.conf.pod
src/common.c
src/df.c
src/interface.c
src/network.c
src/plugin.c
src/plugin.h
src/pyvalues.c