Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Sun, 28 Jun 2015 13:05:45 +0000 (15:05 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 28 Jun 2015 13:05:45 +0000 (15:05 +0200)
commitb720b5a6214ab1b9c058c7bd1fb4aad2f90e7889
tree994f893406e679001f50cde47141ff474f74b976
parent9461848421c468d9117bf6c57335b344db0a420e
parent79593ed5e0a3def8e91be5b1de15a536af2d4a92
Merge branch 'collectd-5.5'