Code

Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 11:38:59 +0000 (12:38 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 11:38:59 +0000 (12:38 +0100)
commit2e632b0929fb957fd686231658bc2999fdfb4b20
tree05f6cd719c66b2b489a1ae2ec5265c541bd007ca
parent6c17c8ccba745714c4d7cc10dc3ca57f2d0d293f
parent8dcf1473b25c4649289ea8b8fb5cb390f2493ce3
Merge branch 'collectd-5.6' into collectd-5.7

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