projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be7afc4 92b213f)
Merge remote-tracking branch 'github/pr/711'
authorFlorian Forster <octo@collectd.org>
Thu, 21 Aug 2014 05:47:03 +0000 (07:47 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Aug 2014 05:47:03 +0000 (07:47 +0200)

Trivial merge
collectd, the system statistics collection daemon