Merge branch 'master' into packaging
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 23 Jan 2012 16:35:47 +0000 (18:35 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 23 Jan 2012 16:35:47 +0000 (18:35 +0200)
1  2 
snf-pithos-app/pithos/api/faults.py
snf-pithos-app/pithos/api/functions.py
snf-pithos-app/pithos/api/login.py
snf-pithos-app/pithos/api/public.py
snf-pithos-app/pithos/api/util.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py
snf-pithos-backend/pithos/backends/lib/sqlalchemy/public.py
snf-pithos-lib/pithos/lib/client.py

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge