diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 23:55:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 23:55:45 +0100 |
| commit | 759a3bcc88230c5232b748bb8f5a0c6e0cce128c (patch) | |
| tree | 25c15bb606cf573ac217f82b2110166a45520734 /source4/scripting | |
| parent | 9617a3945b804bf2d1409285df2a7add12690063 (diff) | |
| parent | 04bef7fe2ab689a9ab569d5581034e0c02237771 (diff) | |
| download | samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.tar.gz samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.tar.bz2 samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.zip | |
Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba
Conflicts:
source4/lib/ldb/ldb_wrap.c
Diffstat (limited to 'source4/scripting')
0 files changed, 0 insertions, 0 deletions