]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a7696b 76f7a23)
Merge branch 'master' of git://dev.medozas.de/iptables
authorPatrick McHardy <kaber@trash.net>
Fri, 25 Jun 2010 12:50:03 +0000 (14:50 +0200)
committerPatrick McHardy <kaber@trash.net>
Fri, 25 Jun 2010 12:50:03 +0000 (14:50 +0200)

Trivial merge
Mirror of git://git.netfilter.org/iptables