]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cf4ec2 3c461ce)
Merge branch 'stable'
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 1 Nov 2011 12:39:06 +0000 (13:39 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 1 Nov 2011 12:39:06 +0000 (13:39 +0100)

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