]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 983196c 2fda8fc)
Merge branch 'stable' into 'master'
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 28 Jan 2013 11:35:41 +0000 (12:35 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 28 Jan 2013 11:35:41 +0000 (12:35 +0100)

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