Code

Merge branch 'ff/network'
authorFlorian Forster <octo@collectd.org>
Wed, 13 Nov 2013 19:09:24 +0000 (20:09 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 13 Nov 2013 19:09:24 +0000 (20:09 +0100)

Trivial merge