git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f28dc02 eb7a53a)
Merge commit 'origin/v3-2-test' into my_branch
authorGuenther Deschner <gd@samba.org>
Thu, 11 Oct 2007 00:33:07 +0000 (02:33 +0200)
committerGuenther Deschner <gd@samba.org>
Thu, 11 Oct 2007 00:33:07 +0000 (02:33 +0200)
(This used to be commit 83fe2b4261f0357a62ea93b806a14225173f4945)


Trivial merge
Samba Shared Repository