Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 15:43:11 +0000 (16:43 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 15:43:11 +0000 (16:43 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge