Code

Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 12:41:18 +0000 (13:41 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 12:41:18 +0000 (13:41 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge