Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 15 Dec 2008 22:19:49 +0000 (23:19 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 15 Dec 2008 22:19:49 +0000 (23:19 +0100)
commit2be233ebe39d6ce584848a7e6bbd68b011dd6930
treeca75915525e4414b57a8fdfaaf68175e990055cc
parent1e419cd31bea64c664c36dee10fa9e843b6f76d6
parent51118b1974fd91d7f60ed1a68e1eb5717690362b
Merge branch 'master' of ssh://git.samba.org/data/git/samba
source3/include/proto.h