Merge branch 'master' into packaging
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 26 Jan 2012 11:24:11 +0000 (13:24 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 26 Jan 2012 11:24:11 +0000 (13:24 +0200)
commit969b426292555ce807555b8001ec9a809efb2d75
tree459161fabd72cd727f959dee8f956f02b7c05574
parent395ccd25d96c16d9d76e1aaa64c5277e5305f638
parentde5f9c1365947cdbf01f7a66f6208d35bf6a141c
Merge branch 'master' into packaging

Conflicts:
pithos/__init__.py
snf-pithos-app/pithos/api/functions.py
snf-pithos-app/pithos/api/util.py
snf-pithos-lib/pithos/lib/client.py
snf-pithos-lib/pithos/lib/transfer.py