git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1bdcd4 1b5f321)
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 21:30:17 +0000 (23:30 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 21:30:17 +0000 (23:30 +0200)
(This used to be commit 0239011ced6c864f85b47a342438228a8f6940ee)


Trivial merge
Samba Shared Repository