]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
Merge branch 'master' of git://dev.medozas.de/iptables
authorJan Engelhardt <jengelh@medozas.de>
Thu, 8 Sep 2011 15:00:49 +0000 (17:00 +0200)
committerJan Engelhardt <jengelh@medozas.de>
Thu, 8 Sep 2011 15:00:49 +0000 (17:00 +0200)

Trivial merge