Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit573441ff9b63fed9ab0b7eaf52df337ccd5592be
authorJelmer Vernooij <jelmer@samba.org>
Sun, 14 Dec 2008 16:17:55 +0000 (14 17:17 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 14 Dec 2008 16:17:55 +0000 (14 17:17 +0100)
tree77c354f48c04fd7d92aa02cd92125eca3d246eae
parentcd25b6245f8185e36a365dcf4c28e7df13090d3e
parentdaeb3a190d16a5bc05be63b2b136ebe65d6f6cf7
Merge branch 'master' of ssh://git.samba.org/data/git/samba
source3/include/proto.h