| commit | 759a3bcc88230c5232b748bb8f5a0c6e0cce128c | |
| author | Jelmer Vernooij <jelmer@samba.org> | |
| Fri, 19 Dec 2008 22:55:45 +0000 (19 23:55 +0100) | ||
| committer | Jelmer Vernooij <jelmer@samba.org> | |
| Fri, 19 Dec 2008 22:55:45 +0000 (19 23:55 +0100) | ||
| tree | 25c15bb606cf573ac217f82b2110166a45520734 | treesnapshot (tar.gz zip) |
| parent | 9617a3945b804bf2d1409285df2a7add12690063 | commitdiff |
| parent | 04bef7fe2ab689a9ab569d5581034e0c02237771 | commitdiff |
Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba
Conflicts:
source4/lib/ldb/ldb_wrap.c
Conflicts:
source4/lib/ldb/ldb_wrap.c