projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44d73d6 1c5607a)
Merge branch 'aw/spamassassin'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 19:59:14 +0000 (20:59 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 19:59:14 +0000 (20:59 +0100)

Trivial merge
collectd, the system statistics collection daemon