Merge branch 'tdr' of /home/jelmer/samba4
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 13:57:58 +0000 (14:57 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 13:57:58 +0000 (14:57 +0100)
commitc223beee2a0bd6922eda4551caec0061c86097f2
tree72e0b2ca7144d0d2d5e08e285f9fb02a92cd67ad
parent74299582c4989d00a45962836bb02cc7f4b2dd20
parent7972d82436f5d93606fb538be180250f2f28de6b
Merge branch 'tdr' of /home/jelmer/samba4