Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 10:19:57 +0000 (11:19 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 10:19:57 +0000 (11:19 +0100)
commit2412d3ca76f7ac24e67543720c1d385188da0ce3
tree3066749f33aab8e85b21a6f6134e0b45b53c77a3
parent1b0f5d61a3e93e83af6b559b60d661a61afd8d9f
parente4504c3cc5582ab915903e1b4ba010545ffc8354
Merge branch 'collectd-5.7'

Conflicts:
contrib/redhat/collectd.spec
contrib/redhat/collectd.spec