]> git.ipfire.org Git - thirdparty/libnftnl.git/commitdiff
Merge branch 'next-3.14' of git.netfilter.org:libnftables into inet
authorPatrick McHardy <kaber@trash.net>
Wed, 8 Jan 2014 18:01:04 +0000 (18:01 +0000)
committerPatrick McHardy <kaber@trash.net>
Wed, 8 Jan 2014 18:01:04 +0000 (18:01 +0000)

Trivial merge