summaryrefslogtreecommitdiffstats
path: root/net/samba4/CONFLICTS
AgeCommit message (Expand)Author
2009-04-18samba4: Added new spell for Samba 4.x experimental branchEric Sandall