]> git.ipfire.org Git - thirdparty/iptables.git/commit
Merge branch 'stable'
authorJan Engelhardt <jengelh@medozas.de>
Wed, 5 Aug 2009 16:13:11 +0000 (18:13 +0200)
committerJan Engelhardt <jengelh@medozas.de>
Wed, 5 Aug 2009 16:13:11 +0000 (18:13 +0200)
commit8e4dacaed17701cb1891b962bb856e0e8cfbb5c8
tree78d2f85ee04280407f81f000ac6ecf0554a560cd
parent80fcb7b40823fed288e253c4a798eb4ee405102c
parentefebafa0021f36f4547b7fcc47620274f333e001
Merge branch 'stable'

Conflicts:
extensions/libxt_conntrack.c

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
extensions/libxt_conntrack.c
extensions/libxt_helper.c