git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0197b8e 4d8f3f1)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Thu, 17 Apr 2008 11:05:25 +0000 (13:05 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 17 Apr 2008 11:05:25 +0000 (13:05 +0200)
(This used to be commit ece878c1f9251b83598508e23ce0015b4db72f0a)


Trivial merge
Samba Shared Repository