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)
commite1fda36ff7e4b5f508b630b614b182e298d91fb7
treeab32a9a09eaec8de4ff78ddf2629d7fbe6e15717
parentbf70b5ba18d3fc58f976f2923ecf7135900537a7
parent1cc8a409058863e20747513d057d5ac471fe1382
Merge branch 'collectd-5.6'
src/daemon/common.c
src/write_http.c