From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 28 Apr 2012 16:19:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'maniacikarus/samba'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9486337df42b75de2bfc6f9c30f1eaa3490648d;p=ipfire-3.x.git

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

c9486337df42b75de2bfc6f9c30f1eaa3490648d