projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b96248 e17a4e5)
Merge branch 'dm/openvpn'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 1 Jan 2009 11:36:40 +0000 (12:36 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 1 Jan 2009 11:36:40 +0000 (12:36 +0100)
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