From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 17 Oct 2011 10:42:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'maniacikarus/samba'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4e90939d2ad420524e2babc0f216cdd868398a8;p=ipfire-3.x.git

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

b4e90939d2ad420524e2babc0f216cdd868398a8