projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5c3463 298e7bf)
Merge branch 'master' into bp/bind
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 18 Jan 2009 22:14:31 +0000 (23:14 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 18 Jan 2009 22:14:31 +0000 (23:14 +0100)

Trivial merge
collectd, the system statistics collection daemon