]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
Merge commit 'nf/master'
authorJan Engelhardt <jengelh@medozas.de>
Sun, 15 Mar 2009 20:26:53 +0000 (21:26 +0100)
committerJan Engelhardt <jengelh@medozas.de>
Sun, 15 Mar 2009 20:26:53 +0000 (21:26 +0100)
1  2 
iptables.c

diff --cc iptables.c
Simple merge