| commit | 03091e55a0d949e35a723dadbd6fd0f78ddf3a8c | [log] [tgz] |
|---|---|---|
| author | Pablo Neira Ayuso <pablo@netfilter.org> | Thu Feb 13 11:39:48 2014 +0100 |
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | Thu Feb 13 11:39:48 2014 +0100 |
| tree | 3ddb3b5d5813261bf8830a923a360ff50b3bb4b8 | |
| parent | 2e5babbfaddb267523c8450acf51c06f00f492c7 [diff] | |
| parent | 1835790d7f7517f4c101e1c1f3df5519a6c228e7 [diff] |
Merge branch 'nft-compat' This merges the branch that contains the iptables over nftables compatibility layer into master.