git.samba.org / amitay / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2bc26db 68a2c54)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into fixbuild
authorJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:34:22 +0000 (22:34 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:34:22 +0000 (22:34 +0200)
(This used to be commit d2d564ad2e9b7cb0440a30a302176cce333649c7)


Trivial merge
Amitay's Samba development tree