Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)
commita898c17330d9a2039bcdb8f7e6dbedba516a6cd8
treeed4cb7a4ea861ceb90628983088426a595f24b72
parent2bd3d909fc730c69cfce902ea5bf3fbb18352f1a
parent171d6a4bd5e05b56be83860701d35bfe1373d6a7
Merge branch 'collectd-4.10'
README
configure.in
src/collectd.h
src/curl_json.c
src/network.c
src/types.db