Merge branch 'collectd-4.10' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Thu, 30 May 2013 06:10:42 +0000 (08:10 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 30 May 2013 06:10:42 +0000 (08:10 +0200)
1  2 
src/mysql.c

diff --cc src/mysql.c
Simple merge