Merge remote-tracking branch 'github/pr/1967'
authorFlorian Forster <octo@collectd.org>
Fri, 11 Nov 2016 20:24:21 +0000 (21:24 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 11 Nov 2016 20:24:21 +0000 (21:24 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge