Code

Merge remote-tracking branch 'collectd/collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 15:40:36 +0000 (16:40 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 15:40:36 +0000 (16:40 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge