Merge branch 'master' of https://code.grnet.gr/git/pithos-macos
authorMiltiadis Vasilakis <mvasilak@gmail.com>
Wed, 12 Oct 2011 21:09:48 +0000 (00:09 +0300)
committerMiltiadis Vasilakis <mvasilak@gmail.com>
Wed, 12 Oct 2011 21:09:48 +0000 (00:09 +0300)
Conflicts:
pithos-macos/PithosUtilities.h
pithos-macos/PithosUtilities.m


Trivial merge