Code

Merge branch 'pr/392'
authorFlorian Forster <octo@collectd.org>
Fri, 9 Aug 2013 05:23:45 +0000 (07:23 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 9 Aug 2013 05:23:45 +0000 (07:23 +0200)

Trivial merge