]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
Merge branch 'next-3.14' of git.netfilter.org:nftables into next-3.14
authorPatrick McHardy <kaber@trash.net>
Mon, 17 Feb 2014 10:47:32 +0000 (10:47 +0000)
committerPatrick McHardy <kaber@trash.net>
Mon, 17 Feb 2014 10:47:32 +0000 (10:47 +0000)

Trivial merge