From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 31 Jan 2012 20:05:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/samba'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e164322be304b35bef89b5cf4f9211b52d1fed51;p=ipfire-3.x.git

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

e164322be304b35bef89b5cf4f9211b52d1fed51