projects / pithos-ms-client / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d56c74 e8fb5bc)
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)
Conflicts:
trunk/Pithos.Installer/PithosPlus.iss


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.