Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 26 Mar 2016 13:24:02 +0000 (14:24 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 26 Mar 2016 13:24:02 +0000 (14:24 +0100)
1  2 
src/mysql.c

diff --cc src/mysql.c
Simple merge