projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: fabc18d)
Merge branch 'collectd-4.9' into collectd-4.10
authorSven Trenkel <collectd@semidefinite.de>
Wed, 19 May 2010 08:58:01 +0000 (10:58 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 19 May 2010 08:58:01 +0000 (10:58 +0200)
Conflicts:
src/python.c


No differences found
collectd, the system statistics collection daemon