git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f873a4 0965b22)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:17 +0000 (17:46 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:17 +0000 (17:46 +1000)
(This used to be commit ce7b1424c711949e6feb0181d3759133b77391ff)


Trivial merge
Samba Shared Repository