]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17f7937 db50b83)
Merge branch 'master' of git://dev.medozas.de/iptables
authorPatrick McHardy <kaber@trash.net>
Wed, 25 May 2011 03:34:04 +0000 (05:34 +0200)
committerPatrick McHardy <kaber@trash.net>
Wed, 25 May 2011 03:34:04 +0000 (05:34 +0200)

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