Code

Merge tag 'upstream/5.5.0' collectd-5.5.0-1
authorSebastian Harl <sh@tokkee.org>
Fri, 21 Aug 2015 12:14:10 +0000 (14:14 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 21 Aug 2015 12:14:10 +0000 (14:14 +0200)
commit9e9a8d617a8b29c6bc8700885e2cd15d8b71e8f1
tree7fdec11b274e511ae639d5550b81a306a83d85e2
parent546a6028cba5a9e237f01dc08a8734c3f5f4ba56
parent1cf67d3e29da8ce7bdb29bc2fb8b1f0c1ca96e39
Merge tag 'upstream/5.5.0'

Upstream version 5.5.0