projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8957d2 ca8b50e)
Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Mon, 20 Jan 2014 16:56:00 +0000 (17:56 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 20 Jan 2014 16:56:00 +0000 (17:56 +0100)

Trivial merge
collectd, the system statistics collection daemon