projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0a9b7b be0a3a6)
Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Mon, 8 Sep 2014 15:11:56 +0000 (17:11 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 8 Sep 2014 15:11:56 +0000 (17:11 +0200)

Trivial merge
collectd, the system statistics collection daemon