summaryrefslogtreecommitdiff
path: root/merged-branches.txt
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-15 17:48:25 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-15 17:48:25 +0200
commit4c6174557384ff6c022872dd4f2bf2ddacfd3b63 (patch)
tree36de32132f0ecb43638d873a9eb45eacbf7cf485 /merged-branches.txt
parentada0e343b2225471a8e623aca7d9aa314857af6c (diff)
parent11ecd5acfdd2af476e03b2818f218e7fbc4d3414 (diff)
downloadsamba-4c6174557384ff6c022872dd4f2bf2ddacfd3b63.tar.gz
samba-4c6174557384ff6c022872dd4f2bf2ddacfd3b63.tar.bz2
samba-4c6174557384ff6c022872dd4f2bf2ddacfd3b63.zip
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'merged-branches.txt')
0 files changed, 0 insertions, 0 deletions