projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dd2f86 878bbfa)
Merge branch 'sh/next' collectd-4.6.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 21:56:37 +0000 (22:56 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 21:56:37 +0000 (22:56 +0100)

Trivial merge
collectd, the system statistics collection daemon