git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9617a39
04bef7f
)
Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba
author
Jelmer Vernooij
<jelmer@samba.org>
Fri, 19 Dec 2008 22:55:45 +0000
(23:55 +0100)
committer
Jelmer Vernooij
<jelmer@samba.org>
Fri, 19 Dec 2008 22:55:45 +0000
(23:55 +0100)
Conflicts:
source4/lib/ldb/ldb_wrap.c
Trivial merge
git.samba.org / samba.git / commitdiff