9db0516 Update to latest upstream release

Authored and Committed by mbooth 7 years ago
    Update to latest upstream release
    Project moved to github and absorbed the merge client plugin
    Obsolete/Provide the collabnet-merge package
    
        
file modified
+2 -0
file modified
+67 -60
file modified
+2 -1
file removed
-19