Merge branch 'collectd-5.4' into collectd-5.5 collectd-5.5.1
authorFlorian Forster <octo@collectd.org>
Fri, 22 Jan 2016 09:53:29 +0000 (10:53 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 22 Jan 2016 09:53:29 +0000 (10:53 +0100)
1  2 
src/collectd.conf.pod
src/df.c

Simple merge
diff --cc src/df.c
Simple merge