Merge remote-tracking branch 'github/pr/2054'
authorFlorian Forster <octo@collectd.org>
Fri, 25 Nov 2016 16:27:10 +0000 (17:27 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 25 Nov 2016 16:27:10 +0000 (17:27 +0100)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge