projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33fdd7d 424841e)
Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Wed, 10 Apr 2013 01:44:29 +0000 (18:44 -0700)
committerFlorian Forster <octo@collectd.org>
Wed, 10 Apr 2013 01:44:29 +0000 (18:44 -0700)

Trivial merge
collectd, the system statistics collection daemon