projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 66f9d64)
Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 27 Nov 2010 10:00:29 +0000 (11:00 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 27 Nov 2010 10:00:29 +0000 (11:00 +0100)
Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh


No differences found
collectd, the system statistics collection daemon