projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b736009 39ef2de)
Merge branch 'sh/collectd-5.1' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Mon, 27 Aug 2012 08:12:11 +0000 (10:12 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 27 Aug 2012 08:12:11 +0000 (10:12 +0200)

Trivial merge
collectd, the system statistics collection daemon