Merge branch 'displaysec' of /home/jelmer/samba4
authorJelmer Vernooij <jelmer@samba.org>
Thu, 26 Mar 2009 14:31:27 +0000 (15:31 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 26 Mar 2009 14:31:27 +0000 (15:31 +0100)
commitef10b40338a98f1700b1a8d24a445715d846a5a6
treeb0c0106ccbb9874875100ae5e18ec301e5c9f777
parent1e200c1952adab450909ac35252be4636c3e1053
parent30a3dec549dc408940710409c80276077b4d9701
Merge branch 'displaysec' of /home/jelmer/samba4