git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e0f61a 5ab27ba)
Merge commit 'origin/v4-0-test' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 13:28:44 +0000 (23:28 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 13:28:44 +0000 (23:28 +1000)
(This used to be commit 2bba77a768c3ed984af05b99c2f7781577d08ec3)


Trivial merge
Kai's WIP code