Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
authorJelmer Vernooij <jelmer@samba.org>
Sat, 11 Oct 2008 12:44:10 +0000 (14:44 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 11 Oct 2008 12:44:10 +0000 (14:44 +0200)
commit6a78e56277799672b7ac187c57e546836e136f79
tree87f0336cb1908d01690b74c56a44f4713559b5bc
parentddbddbd80c80b872cdd36a01f9a3a6bc2eca1b1f
parentf0a27064869871806343648de3b5a0667118872f
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
source3/Makefile.in
source3/include/proto.h