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

Trivial merge
collectd, the system statistics collection daemon