git.samba.org / idra / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a15b6f1 68a2c54)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
authorJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 18:00:32 +0000 (20:00 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 18:00:32 +0000 (20:00 +0200)
(This used to be commit 1ef3830bb0d6e91e3b00e880784ca0741d9b4d49)


Trivial merge
Work In Progress