projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e36357 f4a2e0b)
Merge remote-tracking branch 'github/pr/697'
authorFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:13:52 +0000 (07:13 -0700)
committerFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:13:52 +0000 (07:13 -0700)

Trivial merge
collectd, the system statistics collection daemon