Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 10:31:40 +0000 (11:31 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 10:31:40 +0000 (11:31 +0100)
commit2fb93e85eb5f415fbcdfb2fc0a1a58fad823138a
tree4560bfaa1ad7cc79b24746afa901cc0bac6e5835
parent978eb6f1616122e13429b00268d03942afc41425
parent2a474568c2f85603657a97ad658089122a1f4f19
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial