Merge branch 'refs/heads/0.6'
authorSofia Papagiannaki <papagian@gmail.com>
Fri, 1 Jun 2012 14:40:55 +0000 (17:40 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Fri, 1 Jun 2012 14:40:55 +0000 (17:40 +0300)
commit35f8ccf122cec7fcb4f970052cd2b702efe4c8bc
tree595dec3937ee0dd6007e9415d91b068948126ea8
parent8569eb534061f8a97dbc4216c6f3893ad6f7ebcd
parent3b040f32ba10e1f67d1035b640dbe01857262b71
Merge branch 'refs/heads/0.6'

Conflicts:
docs/source/backends.rst
docs/source/conf.py
docs/source/devguide.rst
snf-astakos-app/astakos/im/api/admin.py
snf-astakos-app/astakos/im/functions.py
snf-astakos-app/conf/20-snf-astakos-app-settings.conf