projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad2caf6 621fa82)
Merging with changes made by Florian Foster.
authorNicolas JOURDEN <nicolas.jourden@laposte.net>
Fri, 20 Nov 2015 15:44:08 +0000 (16:44 +0100)
committerNicolas JOURDEN <nicolas.jourden@laposte.net>
Fri, 20 Nov 2015 15:44:08 +0000 (16:44 +0100)

Trivial merge
collectd, the system statistics collection daemon