git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d9cc2d 6459adb)
Merge branch '4-0-local' into v4-0-stable save-diskspace-tags/samba-4.0.0alpha5
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 09:34:11 +0000 (19:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 09:34:11 +0000 (19:34 +1000)

Trivial merge
Kai's WIP code