projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 574fa99 f6b9d3b)
Merge remote-tracking branch 'origin/master'
authorFlorian Forster <octo@collectd.org>
Fri, 20 Sep 2013 13:32:27 +0000 (15:32 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 20 Sep 2013 13:32:27 +0000 (15:32 +0200)

Trivial merge
collectd, the system statistics collection daemon