]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
projects / thirdparty / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c702e4 e74073f)
Merge branch 'pr/1395'
authorFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 15:39:30 +0000 (16:39 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 15:39:30 +0000 (16:39 +0100)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
Mirror of https://github.com/collectd/collectd.git