git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7054ce6 84c9b62)
Merge commit 'origin/v4-0-test' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:25:14 +0000 (09:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:25:14 +0000 (09:25 +1100)
(This used to be commit 4720f53a92644dd6959e18923924fbe01889111c)


Trivial merge
Kai's WIP code