Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 10:39:37 +0000 (12:39 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 10:39:37 +0000 (12:39 +0200)
commit9fec173b071d0e4c17db73823bd7c1bdd50ad4d1
tree1d5ec16ec4230c9eeacbf4dafa49ceee041e7fe6
parent8e704e4107b284bfc1e43f4c698ac0e6c5ae1800
parent58b4efc9b49c1cc366303a306639a3fc9321dcfe
Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex