Code

Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
1  2 
src/log_logstash.c
src/logfile.c

Simple merge
diff --cc src/logfile.c
Simple merge