tree 3ddb3b5d5813261bf8830a923a360ff50b3bb4b8
parent 2e5babbfaddb267523c8450acf51c06f00f492c7
parent 1835790d7f7517f4c101e1c1f3df5519a6c228e7
author Pablo Neira Ayuso <pablo@netfilter.org> 1392287988 +0100
committer Pablo Neira Ayuso <pablo@netfilter.org> 1392287988 +0100

Merge branch 'nft-compat'

This merges the branch that contains the iptables over nftables
compatibility layer into master.