Code

Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 19:15:18 +0000 (21:15 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 19:15:18 +0000 (21:15 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge