Merge branch 'permissions'
authorAntony Chazapis <chazapis@gmail.com>
Wed, 15 Feb 2012 13:13:12 +0000 (15:13 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Wed, 15 Feb 2012 13:13:12 +0000 (15:13 +0200)
commit2b894199891c0575dcedfb2a60cdf770da6d8d67
tree0c241e4ba9bf6cbd782bc42eb5318a5eb30efef3
parentb9a8feecffeb29fde6a3782402dcbf6bb43fe73a
parent3be0f6c1467057cfeff98ba41640531fbd285c6d
Merge branch 'permissions'

Conflicts:
pithos/backends/modular.py
pithos/backends/lib/sqlalchemy/node.py
pithos/backends/lib/sqlite/node.py
pithos/backends/modular.py