projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5137825 6ec92a3)
Merge branch 'collectd-4.7'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 19 Jul 2009 15:39:06 +0000 (17:39 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 19 Jul 2009 15:39:06 +0000 (17:39 +0200)

Trivial merge
collectd, the system statistics collection daemon