Merge branch 'collectd-5.8'
authorPavel Rochnyack <pavel2000@ngs.ru>
Sun, 20 May 2018 15:41:22 +0000 (22:41 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Sun, 20 May 2018 15:41:22 +0000 (22:41 +0700)

Trivial merge