projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aceb06f 2de2630)
Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 12 Dec 2009 22:36:07 +0000 (23:36 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 12 Dec 2009 22:36:07 +0000 (23:36 +0100)

Trivial merge
collectd, the system statistics collection daemon