From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Jul 2012 19:23:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/ulogd-update'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a64a15f1eb94f4e82d7bb6fe413d4cee05f3456;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/ulogd-update'
---

3a64a15f1eb94f4e82d7bb6fe413d4cee05f3456