From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 12 Jun 2013 08:01:23 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Tag: v1.4.20~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1e394be9d08a9e508ceeffca6866627d5ac40f9;p=thirdparty%2Fiptables.git

Merge branch 'stable'

Get c545933 iptables: Fix connlabel.conf install location
---

f1e394be9d08a9e508ceeffca6866627d5ac40f9