projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fc9dd1 2330853)
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 20 Jun 2010 16:02:39 +0000 (18:02 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 20 Jun 2010 16:02:39 +0000 (18:02 +0200)

Trivial merge
collectd, the system statistics collection daemon