summaryrefslogtreecommitdiff
path: root/docs/htmldocs/Samba3-HOWTO/integrate-ms-networks.html
AgeCommit message (Expand)AuthorFilesLines
2009-06-18Really merge 3.3.5bubulle1-81/+81
2009-06-18Revert the 3.3.5 merge which I did in an unclean copy of the trunk..:-(bubulle1-81/+81
2009-06-18merge upstream 3.3.5bubulle1-81/+81
2009-02-14merge upstream 3.3.0vorlon1-83/+83
2008-10-04merge upstream 3.2.4vorlon1-69/+69
2008-08-11merge upstream 3.2.1vorlon1-80/+80
2008-07-20merge samba 3.2 experimental branch to unstablevorlon1-83/+83
2008-07-13merge upstream 3.0.31bubulle1-83/+83
2008-05-22Merge upstream 3.0.29 in trunkbubulle1-85/+85
2007-11-21merge upstream 3.0.27a into svnvorlon1-0/+461