projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e895cf a60550f)
Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:44 +0000 (12:49 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:44 +0000 (12:49 +0200)

Trivial merge
collectd, the system statistics collection daemon