Merge branch 'master' of https://code.grnet.gr/git/pithos-ios
authorMiltiadis Vasilakis <mvasilak@gmail.com>
Wed, 14 Dec 2011 11:12:24 +0000 (13:12 +0200)
committerMiltiadis Vasilakis <mvasilak@gmail.com>
Wed, 14 Dec 2011 11:12:24 +0000 (13:12 +0200)

Trivial merge