Merge branch 'master' of ssh://git.samba.org/data/git/samba into tevent-standalone
authorJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 19:33:02 +0000 (20:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 19:33:02 +0000 (20:33 +0100)
commit9b16a5ac163025c49b40b7f32f6145da46cd75b8
treee468c68a9f15417a19cbb451a1c074dcda6b3f34
parent28f80dbb7cc7daeb6d285dd26d3ef32a42af93ca
parentf210fbe68b07cadd8ca3e358b1579a9c602cc7f8
Merge branch 'master' of ssh://git.samba.org/data/git/samba into tevent-standalone