diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-08 14:02:22 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-08 14:02:22 +0100 |
| commit | f47093baf0a91c717297ebcbd1d3416d788ba6aa (patch) | |
| tree | e1033c9b06c5067c8bbae54ab26c49050db0886e /source4/torture | |
| parent | fffe4f3bdd27b11dce75c9b2c931f5291f04ab6b (diff) | |
| parent | 0efa783849ff4bd449cdcc5f643f0101d48746bb (diff) | |
| download | samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.tar.gz samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.tar.bz2 samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/scripting/python/samba/provision.py
(This used to be commit e367df5d994181f08ad1a20a0ce01991ca30bcc8)
Diffstat (limited to 'source4/torture')
0 files changed, 0 insertions, 0 deletions