Code

Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:08:20 +0000 (12:08 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:08:20 +0000 (12:08 +0100)
commit171d6a4bd5e05b56be83860701d35bfe1373d6a7
treedf8936ee3468b5ec4a282fd2fbc0a1ea997cd3af
parent72c467f5e8be1a24976d0808a8bdcaa85c6ef9d9
parentb86dd62eef146a35d43b60efa20d30756ce78d00
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
src/collectd.conf.in
src/python.c
README
configure.in
src/collectd-python.pod
src/collectd.h
src/curl_json.c
src/netapp.c
src/network.c
src/python.c
src/utils_match.c