From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 20 Oct 2008 08:53:56 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
X-Git-Tag: samba-4.0.0alpha6~769^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=221ea78e2e1688f2e79703784b3d1d1a68057604;p=thirdparty%2Fsamba.git

Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
---

221ea78e2e1688f2e79703784b3d1d1a68057604