From: Jelmer Vernooij Date: Tue, 25 Nov 2008 14:42:47 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba X-Git-Tag: samba-4.0.0alpha6~480^2~111 X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=fc0985dbc546eff9d9d8660a30a0bf923782f2d7;ds=sidebyside Merge branch 'master' of ssh://git.samba.org/data/git/samba --- fc0985dbc546eff9d9d8660a30a0bf923782f2d7