projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 444a2bc 8694f0e)
Merge branch 'ff/ntpd'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 1 Nov 2006 10:09:47 +0000 (11:09 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 1 Nov 2006 10:09:47 +0000 (11:09 +0100)

Trivial merge
collectd, the system statistics collection daemon