From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 4 Nov 2014 23:57:12 +0000 (+0100)
Subject: Merge branch 'ipset'
X-Git-Tag: v1.6.0~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da6c162ce5fb42fa5439ae0b95c321fb476b9cb7;p=thirdparty%2Fiptables.git

Merge branch 'ipset'

This provides the ipset skbinfo extension.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

da6c162ce5fb42fa5439ae0b95c321fb476b9cb7