]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
projects / thirdparty / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23494a9 861b79c)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 08:06:02 +0000 (18:06 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 08:06:02 +0000 (18:06 +1000)

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