Merge branch 'sharedm4' of /home/jelmer/samba4
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 16:03:17 +0000 (17:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 16:03:17 +0000 (17:03 +0100)
commitec131db4f11e9d47c9bfec7654ab23720c5db713
tree68f63e38ad64b8de7d78a749cf6b9f6894c611e5
parent05a9d0266f9da163b84b830532fb9755a19874da
parente48a18c89be2eb1f606730458d465e49057b158f
Merge branch 'sharedm4' of /home/jelmer/samba4