From: Miltiadis Vasilakis <mvasilak@gmail.com>
Date: Wed, 12 Oct 2011 21:09:48 +0000 (+0300)
Subject: Merge branch 'master' of https://code.grnet.gr/git/pithos-macos
X-Git-Tag: v0.1~41
X-Git-Url: https://code.grnet.gr/git/pithos-macos/commitdiff_plain/8d6721bd7a551bbe25e49b1fd8fac315d2c48fcd?hp=1b1e6fa121f3621ae3e322d47d49c63333fb8f43

Merge branch 'master' of https://code.grnet.gr/git/pithos-macos

Conflicts:
	pithos-macos/PithosUtilities.h
	pithos-macos/PithosUtilities.m
---