Code

Merge remote-tracking branch 'github/pr/697'
authorFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:13:52 +0000 (07:13 -0700)
committerFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:13:52 +0000 (07:13 -0700)

Trivial merge