]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
projects / thirdparty / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e6bfb1 c014ffa)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Thu, 5 Jun 2008 20:03:17 +0000 (22:03 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 5 Jun 2008 20:03:17 +0000 (22:03 +0200)

Trivial merge
Mirror of https://github.com/samba-team/samba.git