Merge remote-tracking branch 'remotes/nvinson/nftables'
authorIan Delaney <idella4@gentoo.org>
Tue, 3 Nov 2015 07:20:32 +0000 (15:20 +0800)
committerIan Delaney <idella4@gentoo.org>
Tue, 3 Nov 2015 08:42:15 +0000 (16:42 +0800)
Gentoo Bug: #540198


Trivial merge