git.samba.org
/
kamenim
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
90f76ae
b2c6ba6
)
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-gmake3
author
Jelmer Vernooij
<jelmer@samba.org>
Fri, 28 Mar 2008 00:00:13 +0000
(
01:00
+0100)
committer
Jelmer Vernooij
<jelmer@samba.org>
Fri, 28 Mar 2008 00:00:13 +0000
(
01:00
+0100)
(This used to be commit
71110c8e7d58f42312938d0a8d0b216cbc313885
)
Trivial merge