git.samba.org / ira / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cb41fd 5aec74c)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 17:18:48 +0000 (19:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 17:18:48 +0000 (19:18 +0200)
(This used to be commit 1659a572c49b2f9cf336b27ec1c1bec1b86d688e)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.