git.samba.org / jra / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23cd8e5 3785b89)
Merge commit 'origin/v3-2-stable' into v3-2-test
authorStefan Metzmacher <metze@samba.org>
Thu, 6 Mar 2008 12:16:30 +0000 (13:16 +0100)
committerStefan Metzmacher <metze@samba.org>
Thu, 6 Mar 2008 12:16:30 +0000 (13:16 +0100)
This brings the release-3-2-0pre2 tag into the v3-2-test history.

I skipped the source/VERSION changes.

metze
(This used to be commit 6761fed30821b30246a0f25874566f8a6019abde)

1  2 
WHATSNEW.txt patch | diff1 | diff2 | blob | history

diff --cc WHATSNEW.txt
Simple merge
Experimental branches for jra