[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab545e1 091ef34)
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Thu, 31 Jan 2013 20:07:45 +0000 (21:07 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 31 Jan 2013 20:07:45 +0000 (21:07 +0100)
1  2 
ChangeLog patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
statistics collection and monitoring daemon (clone)