Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 22 Apr 2008 11:17:05 +0000 (13:17 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 22 Apr 2008 11:17:05 +0000 (13:17 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge