Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge...
authorAndrew Bartlett <abartlet@samba.org>
Wed, 15 Apr 2009 04:36:13 +0000 (14:36 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 15 Apr 2009 04:36:13 +0000 (14:36 +1000)
commit4678d1c6f4de1af9144de37d6d4b35c6c39e254d
tree94e58cf112ef34412bc5521f4bc9f56424ee967f
parent86b50a0e6eacc14e157602811f30f11dccc471a8
parent92d321006d1748ac47cf9b52330212f4ae03f502
Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge-without-netlogond
source3/include/proto.h