Merge branch 'develop' of https://code.grnet.gr/git/kamaki into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 18 Sep 2012 15:13:42 +0000 (18:13 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 18 Sep 2012 15:13:42 +0000 (18:13 +0300)
commitcb73fca1026d1793d23ab3069ac7737b864a953c
treedb244cf833f271badca6550c32a2ec5e5f6c50bf
parent973fbcad30beeab589e468c9e880421002d3e653
parent066ba58cad778229db01ecb340d35eeff323a277
Merge branch 'develop' of https://code.grnet.gr/git/kamaki into develop

Conflicts:
kamaki/clients/pithos.py