From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 29 Jan 2012 11:03:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/libnetfilter_conntrack'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51d35bb26b89d7bd75d979fafea13a6d117aaf77;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/libnetfilter_conntrack'
---

51d35bb26b89d7bd75d979fafea13a6d117aaf77