summaryrefslogtreecommitdiff
path: root/merged-branches.txt
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-11-25 15:24:43 +0100
committerMichael Adam <obnox@samba.org>2008-11-25 15:24:43 +0100
commit03304c5152c8d56030a6e79e37f106a786ed0f64 (patch)
treedfa7e40eae7243b360c85f8675fb53cee1839838 /merged-branches.txt
parent6a4957d35d50e6508917aca62b282ae4904187c8 (diff)
downloadsamba-03304c5152c8d56030a6e79e37f106a786ed0f64.tar.gz
samba-03304c5152c8d56030a6e79e37f106a786ed0f64.tar.bz2
samba-03304c5152c8d56030a6e79e37f106a786ed0f64.zip
Revert "UNFINISHED - s3:idmap_ad: multi-domain"
This reverts commit 6a4957d35d50e6508917aca62b282ae4904187c8. Sorry - this got accidentially pushed. Michael
Diffstat (limited to 'merged-branches.txt')
0 files changed, 0 insertions, 0 deletions