Merge branch 'sb/iptables'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 14 Mar 2007 22:24:38 +0000 (23:24 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 14 Mar 2007 22:24:38 +0000 (23:24 +0100)
commit35248bcc734467e1f1ae39b4a6470849e57624bf
tree40be6e703b6c11656639c1ed813f310c15e5c90a
parent946f782063552f0f6db26c8977ff615bcab0c8b0
parent5ce988e515f51d364b1b2ce422ba2e0d8c83c853
Merge branch 'sb/iptables'

Conflicts:

configure.in
src/Makefile.am
src/collectd.conf.in
configure.in
src/Makefile.am
src/collectd.conf.in