Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Mar 2017 17:36:02 +0000 (18:36 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Mar 2017 17:36:02 +0000 (18:36 +0100)
commit3e0dd5070e385b864c771902bfa4c6331c5710b4
tree46ae9a472b8423b486192b3d83bcde725ed90aff
parentbb546b76861af78f65db1f175842e30d22ca9c03
parent51d29979b01ae0316597898f0e25d4bab7fd7d81
Merge branch 'collectd-5.7'

Conflicts:
contrib/redhat/collectd.spec