Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 17:18:48 +0000 (19:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 17:18:48 +0000 (19:18 +0200)
commit7a2d16241416fe8ae88541e1087aa502c6a5388c
treec5119138eac92cb2817f6ce657aada1bde2024ed
parent7cb41fde3c586daff0c9f52b2b214a8afc3a82a3
parent5aec74c676c6cfd60ebf590a1b0a6d1000b8e33a
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
(This used to be commit 1659a572c49b2f9cf336b27ec1c1bec1b86d688e)