Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 5 Aug 2016 11:17:32 +0000 (13:17 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 5 Aug 2016 11:17:32 +0000 (13:17 +0200)
commit958f7776a2daaa1a8664aded0a2c1d717c2f5909
tree28395142ae7b4c45cfa331e7926fd8dadd790d38
parent42c129f80a181553ac08b6e8d3484a845c674a07
parent7bfda8d327240ac73297e4449663814dd0594be5
Merge branch 'collectd-5.5'

Conflicts:
src/pyvalues.c
src/daemon/plugin.c
src/network.c
src/pyvalues.c