]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables
authorJan Engelhardt <jengelh@medozas.de>
Tue, 29 Jul 2008 17:04:34 +0000 (19:04 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 29 Jul 2008 17:04:34 +0000 (19:04 +0200)

Trivial merge