From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 2 May 2012 13:30:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'maniacikarus/samba'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b60a4efcd4cfeb298e4c6e393a950e5b27712d19;p=ipfire-3.x.git

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

b60a4efcd4cfeb298e4c6e393a950e5b27712d19