Code

Merge branch 'collectd-4.10' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Sun, 7 Apr 2013 03:44:38 +0000 (05:44 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 7 Apr 2013 03:44:38 +0000 (05:44 +0200)
commit9cbc0fe63abd2bd3658b42f19ee144f803b658fa
treecc36a70fdc6804e3d14e0aadd3ac689762290d8e
parentd21cf7f8376b6ce5dd3bbeb41da3aff0e85c6e28
parent0ec776abf45ef3989f38d966e74b588f9ef15ebe
Merge branch 'collectd-4.10' into collectd-5.1

Conflicts:
configure.in
src/mysql.c
src/network.c
src/thermal.c
configure.in
src/mysql.c
src/network.c
src/thermal.c