projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5eb7104 a5dac90)
Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 20:04:03 +0000 (22:04 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 20:04:03 +0000 (22:04 +0200)

Trivial merge
collectd, the system statistics collection daemon