projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 396a709 b920755)
Merge branch 'ff/genericjmx'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Aug 2009 06:14:24 +0000 (08:14 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Aug 2009 06:14:24 +0000 (08:14 +0200)

Trivial merge
collectd, the system statistics collection daemon