Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 1 Jun 2017 18:37:49 +0000 (20:37 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 1 Jun 2017 18:37:49 +0000 (20:37 +0200)
1  2 
src/amqp.c
src/bind.c
src/utils_format_graphite.c

diff --cc src/amqp.c
Simple merge
diff --cc src/bind.c
Simple merge
Simple merge