Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 12:22:34 +0000 (22:22 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 12:22:34 +0000 (22:22 +1000)
commit5d539b7da46e38e7570fa5af4549b142f25e4585
treea6c7beede0939149fc2d67f80b38906a16416935
parent316a9b312a2d4a4ea5a5c70946fb06b61fab1a7d
parent7fb8179f214bbba95eb35d221cb9892b55afe121
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
source/dsdb/samdb/ldb_modules/simple_ldap_map.c