projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e5c93f df724fe)
Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 12:57:29 +0000 (13:57 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 12:57:29 +0000 (13:57 +0100)

Trivial merge
collectd, the system statistics collection daemon