git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bfab3b 9dffeab)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 06:02:13 +0000 (16:02 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 06:02:13 +0000 (16:02 +1000)
(This used to be commit ae502f9e3991209d70a745bef3a3e6e7484cdb5f)


Trivial merge
Samba Shared Repository