]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 967cb71 c303bb0)
Merge branch 'master' of git://dev.medozas.de/iptables into iptables-next
authorPatrick McHardy <kaber@trash.net>
Thu, 13 May 2010 13:43:38 +0000 (15:43 +0200)
committerPatrick McHardy <kaber@trash.net>
Thu, 13 May 2010 13:43:38 +0000 (15:43 +0200)

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