git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
1176e04
a000fa4
)
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
author
James Peach
<jpeach@samba.org>
Sat, 22 Dec 2007 22:01:44 +0000
(14:01 -0800)
committer
James Peach
<jpeach@samba.org>
Sat, 22 Dec 2007 22:01:44 +0000
(14:01 -0800)
(This used to be commit
30cb2d215f1a4a440d5ecaab3f898daa714eee2b
)
Trivial merge