Added by Panos Louridas over 11 years ago
Merge branch 'master' of https://code.grnet.gr/git/pithos-ios
Conflicts: OpenStack.xcodeproj/project.pbxproj