From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 13 Feb 2014 10:39:48 +0000 (+0100)
Subject: Merge branch 'nft-compat'
X-Git-Tag: v1.6.0~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03091e55a0d949e35a723dadbd6fd0f78ddf3a8c;p=thirdparty%2Fiptables.git

Merge branch 'nft-compat'

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

03091e55a0d949e35a723dadbd6fd0f78ddf3a8c