From: Jelmer Vernooij Date: Sat, 20 Dec 2008 19:33:02 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba into tevent-standalone X-Git-Tag: samba-4.0.0alpha6~457^2~2 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=9b16a5ac163025c49b40b7f32f6145da46cd75b8;p=samba.git Merge branch 'master' of ssh://git.samba.org/data/git/samba into tevent-standalone --- 9b16a5ac163025c49b40b7f32f6145da46cd75b8