summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-06 13:16:30 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-06 13:16:30 +0100
commit47d7767065df0da031cdcf70afa426daab83b8b7 (patch)
tree9232e697e830e29cb2d841ad47c156a00741d71f /source3
parent23cd8e5ea7f2aac6cfdcb52666ba4e925740f63f (diff)
parent3785b898178bda8e2aff763d462f21d105aa350d (diff)
downloadsamba-47d7767065df0da031cdcf70afa426daab83b8b7.tar.gz
samba-47d7767065df0da031cdcf70afa426daab83b8b7.tar.bz2
samba-47d7767065df0da031cdcf70afa426daab83b8b7.zip
Merge commit 'origin/v3-2-stable' into v3-2-test
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)
Diffstat (limited to 'source3')
0 files changed, 0 insertions, 0 deletions