]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69f3f84 6465867)
Merge branch 'next-3.14'
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 16 May 2014 12:11:05 +0000 (14:11 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 16 May 2014 12:11:05 +0000 (14:11 +0200)

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