projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 801389e 4dc9287)
Merge branch 'collectd-5.0'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:44 +0000 (08:47 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:44 +0000 (08:47 +0100)

Trivial merge
collectd, the system statistics collection daemon