Merge branch 'collectd-4.9'
authorFlorian Forster <octo@noris.net>
Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)
commita158940fd85bbef59a65f593cd8130896f5c44d0
tree1352a8ba52a6d2324cdbe97188225966b19a5f35
parentcfc1e53a271638237fb0da769ae0e5485fa99495
parentd48a9456e42af4ab5881ab055c95ceab71819bc1
Merge branch 'collectd-4.9'
src/network.c
src/plugin.c