Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorPanagiotis Kanavos <pkanavos@gmail.com>
Tue, 13 Mar 2012 15:01:59 +0000 (17:01 +0200)
committerPanagiotis Kanavos <pkanavos@gmail.com>
Tue, 13 Mar 2012 15:01:59 +0000 (17:01 +0200)
commit0d56c74a9cbc076cd7bdefcf055acfd4fa664b1e
tree7a99a42eb28d193b099fc1b4d252fece753d6366
parent70c12416baf4ee9672d9b00ed3b69a47ce2effb0
parentdcd00efe123b7338d63773c4b80d46eca910dc7e
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

Conflicts:
trunk/Pithos.Installer/PithosPlus.iss
trunk/Pithos.Installer/PithosPlus.iss