Code

Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 5 Dec 2016 18:49:07 +0000 (19:49 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 5 Dec 2016 18:49:07 +0000 (19:49 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge