diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 14:07:38 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 14:07:38 +0100 |
commit | 1d59fd4d733007ccabb69c945e1da2208c376b96 (patch) | |
tree | c9e7cd077b232c781ba1fc28f326998fba6669e0 /merged-branches.txt | |
parent | b64b78e4cc2aaed779a07dbcb180323bfb3652d6 (diff) | |
parent | 11a25f90500b64f4b43907f6f311dc5e9731da39 (diff) | |
download | samba-1d59fd4d733007ccabb69c945e1da2208c376b96.tar.gz samba-1d59fd4d733007ccabb69c945e1da2208c376b96.tar.bz2 samba-1d59fd4d733007ccabb69c945e1da2208c376b96.zip |
Merge branch 'v4-0-test' of /home/jelmer/samba4
Diffstat (limited to 'merged-branches.txt')
0 files changed, 0 insertions, 0 deletions