git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89c12df b3e202e)
Merge branch '4-0-local' into v4-0-stable
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)
(This used to be commit dc238848b3987a187212bd8088916c5b34755b0f)


Trivial merge
Samba Shared Repository