git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7974ccb 1384f83)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 10 Jun 2008 03:19:56 +0000 (13:19 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 10 Jun 2008 03:19:56 +0000 (13:19 +1000)
(This used to be commit 1d52d9cc70158dbe30325220aa5c1e6203c8b72b)


Trivial merge
Samba Shared Repository