Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Sun, 28 Jun 2015 13:05:36 +0000 (15:05 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 28 Jun 2015 13:05:36 +0000 (15:05 +0200)
commit79593ed5e0a3def8e91be5b1de15a536af2d4a92
tree9886abe32598978525b0256baf59e1e879e00840
parentba5d00054e24261b3b8cbbef56dc6e6ae54f61bc
parent6966c22daad028359bac6747d709416a64779d6a
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/common.c
src/df.c
src/tcpconns.c