Merge branch 'master' of ssh://git.samba.org/data/git/samba into talloc-next
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 16:13:10 +0000 (17:13 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 16:13:10 +0000 (17:13 +0100)
commit08b180e40e5179cc02d4aa1867d5063f47b85790
tree015efb48b4c8cd638505457eeed44d15e5b69931
parent74293f117b08ffefdad78828ad9cfa8f8f6049e0
parent09ac816b36e45fd537af2f7fe7c57a11f5c744f5
Merge branch 'master' of ssh://git.samba.org/data/git/samba into talloc-next