git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 011e89c 97f61b5)
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Tue, 15 Jan 2008 13:58:47 +0000 (13:58 +0000)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Tue, 15 Jan 2008 13:58:47 +0000 (13:58 +0000)
(This used to be commit 3a61e663e51fe620225691bc8673bf8800a36f47)


Trivial merge
Kai's WIP code