Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 18 Dec 2009 10:26:20 +0000 (11:26 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 18 Dec 2009 10:26:20 +0000 (11:26 +0100)
commit557b23d4bc8eb6ca64eab72b2d768112486f5001
treee609607f47c2b15ae5b73480fe6a54251205bdc8
parent5ad3a491af300d7336112607e20b0364d1f3f2bb
parenta4ddcbc7984bd1fd62d3b973ef4c371d95da7dbf
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
ChangeLog
ChangeLog
src/network.c
version-gen.sh