summaryrefslogtreecommitdiff
path: root/merged-branches.txt
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-05 14:02:30 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-05 14:02:30 +0100
commitde7dc2cec059305d28cc75a5347bfd88f3cb5c95 (patch)
treea286f235cbbbbaff06f83a32e55b0199da6dd8e4 /merged-branches.txt
parentca05542d3defe76c3bce48eaff1fc749821a976c (diff)
parent21b7b000fb53ac3025d0038cc551a47f9d4a743b (diff)
downloadsamba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.tar.gz
samba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.tar.bz2
samba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'merged-branches.txt')
0 files changed, 0 insertions, 0 deletions