Code

Merge branch 'collectd-5.6'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 26 Oct 2016 17:33:44 +0000 (19:33 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 26 Oct 2016 17:33:44 +0000 (19:33 +0200)
1  2 
src/daemon/common.c
src/write_http.c

Simple merge
Simple merge