Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 7 Apr 2010 09:55:15 +0000 (11:55 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 7 Apr 2010 09:55:15 +0000 (11:55 +0200)
commit07be522384e753b7921213a0dc96a50336c79a66
treec585018b2b421ee8fbe507e507805c1feb29fbad
parentaa73e1258b820025e1ff04d6fe2cc59696ce1a12
parent24b8995d6ffaba6e1ad59cc330938466454059e7
Merge branch 'collectd-4.8' into collectd-4.9
README
configure.in
src/Makefile.am
src/collectd.conf.in
src/network.c