Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 15:03:00 +0000 (16:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 15:03:00 +0000 (16:03 +0100)
commitd96fcc52a70fd1236b767b1d88a39d78c4e8c48c
treea57c8929e24dbf607dbc0ea12114d90b46608bae
parenta16c9a2129ce92e7e1a613b2badd168e42ead436
parentd2eb404ba1711abf6bb2718f8bb1dbbd104e7d4d
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
source/ntvfs/posix/pvfs_rename.c
source/smbd/server.c