Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 18 Mar 2016 12:04:19 +0000 (13:04 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 18 Mar 2016 12:04:19 +0000 (13:04 +0100)
commit5047407e6c0ca8b53bf1629144396702cd18cf08
treea754f0fc6ded94bb6acef88c4ce7d55fb1df2a2a
parenta41f312a8d48a989dfba00a8b43532c60f67caba
parent25b5f5c49dd50c64f41b7bf69b8e471b0ffc6f15
Merge branch 'collectd-5.5'