projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51f9222 cbe5d0b)
Merge branch 'import/ss/graphite' into ss/graphite
authorFlorian Forster <octo@collectd.org>
Thu, 2 Feb 2012 17:19:15 +0000 (18:19 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 2 Feb 2012 17:19:15 +0000 (18:19 +0100)

Trivial merge
collectd, the system statistics collection daemon