diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-07-15 22:22:34 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-15 22:22:34 +1000 |
| commit | 1d3bdf3f546c4ad849333cd743bc97646775c509 (patch) | |
| tree | 4d85cb1a497364282668590c4ea1cd9c79448697 /swat | |
| parent | c46afc8c447e3edb1dc81777700753b98aaa0f93 (diff) | |
| parent | d904b71879cf980f602bfd400cf98396616c13e1 (diff) | |
| download | samba-1d3bdf3f546c4ad849333cd743bc97646775c509.tar.gz samba-1d3bdf3f546c4ad849333cd743bc97646775c509.tar.bz2 samba-1d3bdf3f546c4ad849333cd743bc97646775c509.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
Conflicts:
source/dsdb/samdb/ldb_modules/simple_ldap_map.c
(This used to be commit 5d539b7da46e38e7570fa5af4549b142f25e4585)
Diffstat (limited to 'swat')
0 files changed, 0 insertions, 0 deletions