Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorPanagiotis Kanavos <pkanavos@gmail.com>
Tue, 13 Mar 2012 15:15:13 +0000 (17:15 +0200)
committerPanagiotis Kanavos <pkanavos@gmail.com>
Tue, 13 Mar 2012 15:15:13 +0000 (17:15 +0200)
commit2b8eb2b51bfb7a0ed8086d3537167a33fdec1413
tree4ddececa34ffbe70bbc8d23ce15413f4e427f098
parent0d56c74a9cbc076cd7bdefcf055acfd4fa664b1e
parente8fb5bcb3c501f95ca855b896ed0aae526752bae
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

Conflicts:
trunk/Pithos.Installer/PithosPlus.iss