Merge branch 'ff/tcpconns'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:57:51 +0000 (18:57 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:57:51 +0000 (18:57 +0200)
commit302d7eef72758ec38f28e926480df115ea38f72a
tree8cace505d05b4ffd9d1f1fc7fb75902894961ec4
parenta3493034a18071ca822570a8fab474cac017e330
parent20426b751ddb9c7dcf2eab8e47474248373aa111
Merge branch 'ff/tcpconns'
src/collectd.conf.in