git.samba.org / obnox / samba-ctdb.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6f97083 26e36db)
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 20:44:31 +0000 (12:44 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 20:44:31 +0000 (12:44 -0800)
commit03d3009986b3c82b55723e6db21e386a6bcedee8
tree020d92d31da9e37d2c6e132b6064c040ae63956atree
parent6f970837d025e56e1e033e7922d6d5d1539a97ebcommit | diff
parent26e36db607caef8d7432d80322377c20911912efcommit | diff
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

Conflicts:

source/Makefile.in
(This used to be commit 351df194a927371600824f4c03d8a24b95fbef64)
source3/Makefile.in diff1 | diff2 | blob | history
SAMBA-CTDB repository