git.samba.org / amitay / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4b303b fad5b6c)
Merge commit 'origin/v4-0-stable' into v4-0-test
authorStefan Metzmacher <metze@samba.org>
Wed, 2 Jul 2008 13:43:57 +0000 (15:43 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 2 Jul 2008 13:43:57 +0000 (15:43 +0200)
(This used to be commit 91c899290f6962f277c103f11d5d8dc0a7c9aa02)


Trivial merge
Amitay's Samba development tree