Code

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)
1  2 
src/collectd.conf.in

Simple merge