Code

Merge branch 'master' of github.com:bbczeuz/collectd
authorClaudius Zingerli <gitmail@zeuz.ch>
Fri, 12 Feb 2016 10:48:19 +0000 (11:48 +0100)
committerClaudius Zingerli <gitmail@zeuz.ch>
Fri, 12 Feb 2016 10:48:19 +0000 (11:48 +0100)

Trivial merge