projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 959e4e7 97addf1)
Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 19 Aug 2010 13:02:48 +0000 (15:02 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 19 Aug 2010 13:02:48 +0000 (15:02 +0200)

Trivial merge
collectd, the system statistics collection daemon