Merge server implementation.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 22:59:38 +0000 (22:59 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 22:59:38 +0000 (22:59 +0000)
commited1e8021e6610b3ffbb827764567951b85ae9ba2
tree309cdb89b0ef90f4f09865b7e2051949fb41bf1a
parent9bd2ab89327cf6e6a567889220dd3f2f5f352691
parent0e186f3598a9fa5ef1074143b7e9b1898b073951
Merge server implementation.