Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
commit9a3479d538c92e5a98b14574acd2cc4ee3a3e440
tree53e185a9b6e1fe861824a52109e0d13de9625c5c
parent3404eff3166291e2e7632cc61ef326a802e81e60
parent39a23c3c782d30ea8c45715490987a251e5d06f9
Merge branch 'collectd-4.10'
configure.in
src/df.c
src/swap.c