Code

Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 2 Oct 2009 07:54:14 +0000 (09:54 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 2 Oct 2009 07:54:14 +0000 (09:54 +0200)
commita497509bc0a06065759a6d4e43497b75a2c9ecb8
tree922b94531cb0e75355ee748bb305e7882906072b
parent4f0c7b9794d0ea888123502418545c8f1ff3fc9f
parentec6204a39b67229bfb05b763d1ceea135150880d
Merge branch 'collectd-4.8'

Conflicts:
src/df.c
README
src/df.c