projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f3702f 82882bc)
Merge branch 'collectd-4.9'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 22 Apr 2010 09:29:19 +0000 (11:29 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 22 Apr 2010 09:29:19 +0000 (11:29 +0200)

Trivial merge
collectd, the system statistics collection daemon