git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb98944 c1c6c1b)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 14 Aug 2008 21:58:03 +0000 (07:58 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 14 Aug 2008 21:58:03 +0000 (07:58 +1000)
(This used to be commit b337369d5c86b37d93ee1c62880068e14d6c09f6)


Trivial merge
Samba Shared Repository