Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Sat, 14 Jun 2008 10:15:24 +0000 (12:15 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 14 Jun 2008 10:15:24 +0000 (12:15 +0200)
commit5bc9ef0e33ed2827cbd2ab03b58a6de9220ad86d
treea07a881a92369f934549ee5d04d1f0fc5f0ff65a
parent21a11373e05c3278d05f56c4ee5940f31045a7ab
parentf3fb381952e6afd4b3d15758eaf3aaf29a112eec
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
(This used to be commit 168bb8473c0cfeb388f9955059f92410b8ba5d06)