Code

Merge branch 'master' of github.com:collectd/collectd
authorPierre-Yves Ritschard <pyr@spootnik.org>
Sat, 26 Jul 2014 07:05:40 +0000 (09:05 +0200)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Sat, 26 Jul 2014 07:05:40 +0000 (09:05 +0200)

Trivial merge