Added by Panagiotis Kanavos about 11 years ago
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
Conflicts: trunk/Pithos.Installer/PithosPlus.iss