Merge collectd (5.7.1-1.1) import into refs/heads/workingbranch
authorSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Sun, 5 Feb 2017 19:40:33 +0000 (19:40 +0000)
committerSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Sun, 5 Feb 2017 19:40:33 +0000 (19:40 +0000)

Trivial merge