From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 31 Oct 2011 12:24:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/rsyslog'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=750384fe36f4c31e929c91ef2dfa966c9754ddb7;p=ipfire-3.x.git

Merge remote-tracking branch 'maniacikarus/rsyslog'
---

750384fe36f4c31e929c91ef2dfa966c9754ddb7