From: Florian Forster <octo@collectd.org>
Date: Mon, 27 Aug 2012 06:39:17 +0000 (+0200)
Subject: Merge branch 'ms/tcpconns'
X-Git-Tag: collectd-5.2.0~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=531f59523e969b498c570f9f7083bf41b6811773;p=thirdparty%2Fcollectd.git

Merge branch 'ms/tcpconns'
---

531f59523e969b498c570f9f7083bf41b6811773