Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:46 +0000 (13:16 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:46 +0000 (13:16 +0200)
commit62430c784cf53c7dccb6fec021f9bb4c0d790a0f
tree7761b95743e43dcc491f2f515d265c42492fcc2d
parentca3fb937748e51b9a4e7ef170777a0f4bfff7695
parentae210a9978f06e6ed7de560b5621ba3d9c761315
Merge branch 'collectd-4.3' into collectd-4.4