projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98b20a2 902f762)
Merge commit 'octo/master'
authorSven Trenkel <collectd@semidefinite.de>
Thu, 1 Oct 2009 11:25:17 +0000 (13:25 +0200)
committerSven Trenkel <collectd@semidefinite.de>
Thu, 1 Oct 2009 11:25:17 +0000 (13:25 +0200)

Trivial merge
collectd, the system statistics collection daemon