git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cc90f6 61379d9)
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jan 2008 00:47:52 +0000 (11:47 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jan 2008 00:47:52 +0000 (11:47 +1100)
(This used to be commit 8011716734cb8e3c34f85d9d68201f13cb5b8e0a)


Trivial merge
Kai's WIP code