Merge branch 'collectd-5.6'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 22 Aug 2016 20:13:13 +0000 (22:13 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 22 Aug 2016 20:13:13 +0000 (22:13 +0200)
commit8313250e5fdc28c9f01b5bc94211fe0e7a8f023e
tree5525b6399870b32124472071d4c15a6bf11c9907
parent42a9adc68340fcdb4dd1eade9790f1cb27120d4a
parent7a43e0b7b46589add8b7a3e7a870dc6485e04cdf
Merge branch 'collectd-5.6'