projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 171d6a4)
Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:08:20 +0000 (12:08 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:08:20 +0000 (12:08 +0100)
Conflicts:
src/collectd.conf.in
src/python.c


No differences found
collectd, the system statistics collection daemon