summaryrefslogtreecommitdiff
path: root/merged-branches.txt
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-21 14:07:38 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-21 14:07:38 +0100
commit1d59fd4d733007ccabb69c945e1da2208c376b96 (patch)
treec9e7cd077b232c781ba1fc28f326998fba6669e0 /merged-branches.txt
parentb64b78e4cc2aaed779a07dbcb180323bfb3652d6 (diff)
parent11a25f90500b64f4b43907f6f311dc5e9731da39 (diff)
downloadsamba-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