changed file permissions
changed file permissions
changed where this link points to
Merge branch 'master' of ssh://rikajoho.informatik.tu-muenchen.de/Users/andrea/SparkleShare/PSSH2
only file permissions should have changed
Merge branch 'master' of ssh://rikajoho.informatik.tu-muenchen.de/Users/andrea/SparkleShare/PSSH2
no clue what is there to merge
Merge branch 'master' of ssh://rikajoho.informatik.tu-muenchen.de/Users/andrea/SparkleShare/PSSH2
Getting newest cod from my_mac. Merging with local changes should be minor.