Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 10:17:58 +0000 (11:17 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 10:17:58 +0000 (11:17 +0100)
commite4504c3cc5582ab915903e1b4ba010545ffc8354
treedaf9518a811d41d915312a44044a3fb90903f256
parentf7e2d82c4d016df72c55e85bb9c5bc9ba08d5f91
parentbf4dcf7d2be115582c420bc1b379d594b9132f5a
Merge branch 'collectd-5.6' into collectd-5.7

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