summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2008-01-16 12:57:15 +0300
committerAlexander Bokovoy <ab@samba.org>2008-01-16 12:57:15 +0300
commitb3f3eb1bc551b8bc9698257cf1b3abc7442dd41b (patch)
tree6b8887ca9a27a0f961b0b0ce554eabe8497a4ab8 /source3
parent1e0abd97f9f6919ca338ee696d35064efd0f8774 (diff)
parentb9d21dd668d3032643bf8d465d7b988de2d2f49a (diff)
downloadsamba-b3f3eb1bc551b8bc9698257cf1b3abc7442dd41b.tar.gz
samba-b3f3eb1bc551b8bc9698257cf1b3abc7442dd41b.tar.bz2
samba-b3f3eb1bc551b8bc9698257cf1b3abc7442dd41b.zip
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge
(This used to be commit 17b2bea7093681a4c4119f9fe7104c018fd0af6f)
Diffstat (limited to 'source3')
0 files changed, 0 insertions, 0 deletions