projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b32bdd 7a36ec8)
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 16 Nov 2010 11:20:18 +0000 (12:20 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 16 Nov 2010 11:20:18 +0000 (12:20 +0100)

Trivial merge
collectd, the system statistics collection daemon