Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 19 Feb 2017 11:59:13 +0000 (12:59 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 19 Feb 2017 11:59:13 +0000 (12:59 +0100)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge