projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 070563c 51bbc85)
Merge branch 'cstenac'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Mar 2010 21:43:05 +0000 (22:43 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Mar 2010 21:43:05 +0000 (22:43 +0100)

Trivial merge
collectd, the system statistics collection daemon