Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 2 Dec 2016 13:01:27 +0000 (14:01 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 2 Dec 2016 13:01:27 +0000 (14:01 +0100)
commit2e79fb47c10ffd9efc9532c68fc18a1ad8eaaf61
tree117f027d641d273d3dc936797a519b94dea238fb
parent797ed5e5bee9ee89361f12e447ffc6ceb6ef79d2
parentd5569bf266133d0bef3a1d3f805d72713ceb84cf
Merge branch 'collectd-5.7'