projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 514a999 a69146c)
Merge branch 'vbartoni/df'
authorFlorian Forster <octo@collectd.org>
Wed, 3 Jul 2013 05:46:40 +0000 (07:46 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 3 Jul 2013 05:46:40 +0000 (07:46 +0200)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
collectd, the system statistics collection daemon