![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 14 Mar 2007 22:24:38 +0000 (23:24 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 14 Mar 2007 22:24:38 +0000 (23:24 +0100) | ||
| commit | 35248bcc734467e1f1ae39b4a6470849e57624bf | |
| tree | 40be6e703b6c11656639c1ed813f310c15e5c90a | tree | snapshot |
| parent | 946f782063552f0f6db26c8977ff615bcab0c8b0 | commit | diff |
| parent | 5ce988e515f51d364b1b2ce422ba2e0d8c83c853 | commit | diff |
Merge branch 'sb/iptables'
Conflicts:
configure.in
src/Makefile.am
src/collectd.conf.in
Conflicts:
configure.in
src/Makefile.am
src/collectd.conf.in
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |