Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 11 Aug 2016 15:45:48 +0000 (17:45 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 11 Aug 2016 15:45:48 +0000 (17:45 +0200)
1  2 
configure.ac
src/utils_db_query.c

diff --cc configure.ac
Simple merge
Simple merge