Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry
authorJelmer Vernooij <jelmer@samba.org>
Thu, 18 Dec 2008 14:54:57 +0000 (14:54 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 18 Dec 2008 14:54:57 +0000 (14:54 +0000)
commitd14c8604653d39dd25736279d34930ee7a3ae103
tree626f700b9b42b798ed7459a5cba5cd27aca9753e
parent0c0b9c738f0fc1bf8aa64533a5e4e0635b84f58f
parentfc31f2c5269fd405be96b9a036baf35a60141ccf
Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry