Code

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)
commitd5565943cd7ee338e5b750a027faff8115df4c72
tree9f90fdec835a974d8b1de8c857dc87160439e0db
parent6eb5239cb5b9663722e0dabb036e7263696ed5aa
parent573db6cb7d8904468546746117efbd989d4a5843
Merge branch 'collectd-5.4' into collectd-5.5
src/collectd.conf.pod
src/df.c