Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Wed, 18 Jul 2012 12:13:07 +0000 (15:13 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Wed, 18 Jul 2012 12:13:07 +0000 (15:13 +0300)
commitdeacb43fbe1e52b861704abef83af1f8f82a0b17
tree92ce009db0b6f5280eaaaf445008c44e9f8ad48b
parent2c7aacf63e521d7306a6c6f83e14bfed015f29df
parent9c26045def277c48c450107df0d57df75330c7cc
Merge branch 'master' of https://code.grnet.gr/git/pithos

Merge with pithos-migrate

Conflicts:
snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic.ini
snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic.ini