Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 26 Mar 2016 18:55:29 +0000 (19:55 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 26 Mar 2016 18:55:29 +0000 (19:55 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge