Code

Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Mar 2017 16:14:53 +0000 (17:14 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Mar 2017 16:14:53 +0000 (17:14 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge