From: Jelmer Vernooij Date: Thu, 18 Dec 2008 14:54:57 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry X-Git-Tag: samba-4.0.0alpha6~462^2~14 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=d14c8604653d39dd25736279d34930ee7a3ae103;p=samba.git Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry --- d14c8604653d39dd25736279d34930ee7a3ae103