git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3e202e d494236)
Merge branch '4-0-stable' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 11:54:01 +0000 (21:54 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 11:54:01 +0000 (21:54 +1000)
(This used to be commit 857df6e91874407f70436749e3dad13ada003e6e)


Trivial merge
Kai's WIP code