diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 19:12:00 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 19:12:00 +0200 |
commit | adc84e12865115f15df01676b2040d9e06cafa2c (patch) | |
tree | 89a45b9c706b25cff55575e7f2760b9424ae5486 /COPYING | |
parent | ddfc4380adc46a7c004ebc35da32e491ea39184a (diff) | |
parent | c9d7ebcc0e0ed4de6c5252ed005f89fc473f6dc1 (diff) | |
download | samba-adc84e12865115f15df01676b2040d9e06cafa2c.tar.gz samba-adc84e12865115f15df01676b2040d9e06cafa2c.tar.bz2 samba-adc84e12865115f15df01676b2040d9e06cafa2c.zip |
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 3cff5bc25ad894bef6ed65566d9d692968092760)
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions