projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cf0dd2 80a66a5)
Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Sun, 23 Sep 2012 10:22:37 +0000 (12:22 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 23 Sep 2012 10:22:37 +0000 (12:22 +0200)

Trivial merge
collectd, the system statistics collection daemon