projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63c8e3e 0c3e260)
Merge branch 'sh/teamspeak2'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Apr 2008 09:57:50 +0000 (11:57 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Apr 2008 09:57:50 +0000 (11:57 +0200)

Trivial merge
collectd, the system statistics collection daemon