Merge branch 'master' of ssh://git.samba.org/data/git/samba into talloc-next
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 15:23:53 +0000 (16:23 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 15:23:53 +0000 (16:23 +0100)
commit54bc27e9374742d37b1ed9012d1cfe8f5ace6d40
tree6758fc4a1867dc76a016bc29d36d07e63853a15e
parent55903e6f9120f1ec58a8554813229975c3028a09
parent4a35c974e97551b1ccbfa41d4c08f0598e3c26aa
Merge branch 'master' of ssh://git.samba.org/data/git/samba into talloc-next