projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8b0fd4 228f99e)
Merge branch 'pull/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 17:21:33 +0000 (19:21 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 17:21:33 +0000 (19:21 +0200)

Trivial merge
collectd, the system statistics collection daemon