Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 12:18:54 +0000 (13:18 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 12:18:54 +0000 (13:18 +0100)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge