]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
Merge branch 'master' of git://dev.medozas.de/iptables into m2
authorJan Engelhardt <jengelh@medozas.de>
Mon, 15 Nov 2010 13:39:50 +0000 (14:39 +0100)
committerJan Engelhardt <jengelh@medozas.de>
Mon, 15 Nov 2010 13:39:50 +0000 (14:39 +0100)

Trivial merge