Code

Merge branch 'ms/tcpconns'
authorFlorian Forster <octo@collectd.org>
Mon, 27 Aug 2012 06:39:17 +0000 (08:39 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 27 Aug 2012 06:39:17 +0000 (08:39 +0200)

Trivial merge