git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 688964c 4d2f441)
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:07:17 +0000 (19:07 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:07:17 +0000 (19:07 +0200)
(This used to be commit ad58defe129d25ea2e8a598934800610189747e8)


Trivial merge
Samba Shared Repository