git.samba.org / gd / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65f365d 98154fd)
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 16:55:38 +0000 (18:55 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 16:55:38 +0000 (18:55 +0200)
(This used to be commit 84c9fbe8466e013e501eecf9b2e7981c1df8232c)


Trivial merge
Samba Development trees