Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:43:30 +0000 (12:43 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:46:59 +0000 (12:46 +0200)
commit400596160704146845940d7d9c4f794c0d2ddc03
tree9e16bc493d399ab546e24fcc0eb1323b3dd1e585
parentab6ab6ad6428ba0a0987a20a7d1cfa47d6cc6f8b
parentb3c87d5576e385a407081f86c9a3b84fa6983c0f
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/utils_db_query.c
src/utils_db_query.h
src/disk.c
src/network.c
src/utils_db_query.c
src/utils_db_query.h