git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6998ef4 13eefa7)
Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 19 Dec 2008 20:47:45 +0000 (21:47 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 19 Dec 2008 20:47:45 +0000 (21:47 +0100)
1  2 
source4/lib/ldb/tests/python/ldap.py patch | diff1 | diff2 | blob | history

diff --cc source4/lib/ldb/tests/python/ldap.py
Simple merge
Samba Shared Repository