projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7353a23 d0efcb2)
Merge branch 'master' into ss/graphite
authorFlorian Forster <octo@collectd.org>
Mon, 6 Feb 2012 13:37:52 +0000 (14:37 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 6 Feb 2012 13:37:52 +0000 (14:37 +0100)

Trivial merge
collectd, the system statistics collection daemon