Code

Merge branch 'master' of git.edu-zg.ch:zeuz/collectd
authorClaudius Zingerli <gitmail@zeuz.ch>
Thu, 21 Jan 2016 16:46:50 +0000 (17:46 +0100)
committerClaudius Zingerli <gitmail@zeuz.ch>
Thu, 21 Jan 2016 16:46:50 +0000 (17:46 +0100)

Trivial merge