git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 391f089 61a015a)
Merge commit 'origin/v4-0-test' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 18 Jan 2008 06:05:17 +0000 (17:05 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 18 Jan 2008 06:05:17 +0000 (17:05 +1100)
(This used to be commit 51422414bed28f425197519298c6b04a9f4e2c4e)


Trivial merge
Samba Shared Repository