git.samba.org / idra / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ef7ddb 21f5f4d)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 25 Jan 2008 12:16:34 +0000 (23:16 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 25 Jan 2008 12:16:34 +0000 (23:16 +1100)
(This used to be commit 1e042908992cdf3149ffc24472c7f0b1c3f9edef)


Trivial merge
Work In Progress