git.verplant.org Git - collectd.git/commit

author	Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
	Wed, 11 Jun 2008 12:30:56 +0000 (14:30 +0200)
committer	Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
	Wed, 11 Jun 2008 12:30:56 +0000 (14:30 +0200)
commit	7746d34c8ecc4fa984187cf2b1a93d1b6d3a061b
tree	5338d33b6766dc1da8823bf52651e4bbc28566c0	tree \| snapshot
parent	c60c6dfa5960b23bdc59341ae73e701dd59d4305	commit \| diff
parent	7e44a991736f5b26f035711bb9296a176722edaf	commit \| diff

Merge branch 'collectd-4.3' into collectd-4.4

12 files changed:

collectd, the system statistics collection daemon