summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-12-24 12:10:43 +0100
committerStefan Metzmacher <metze@samba.org>2010-12-24 12:11:08 +0100
commitd00c5cc1ec75345dbddceecc0d168ca909d63c18 (patch)
treed7c03f2412f62739ae608c6ca940923247fc0d4f /docs-xml
parentbf0d5d04ab3900361d0b4762de8d51571a4c5176 (diff)
parent0eded28c2371adb356fc6c48185455fd6257c0c5 (diff)
downloadsamba-d00c5cc1ec75345dbddceecc0d168ca909d63c18.tar.gz
samba-d00c5cc1ec75345dbddceecc0d168ca909d63c18.tar.bz2
samba-d00c5cc1ec75345dbddceecc0d168ca909d63c18.zip
Merge remote branch 'origin/v4-0-test'
'git merge -s ours origin/v4-0-test' to get the release tag into master. metze
Diffstat (limited to 'docs-xml')
0 files changed, 0 insertions, 0 deletions