Merge branch 'master' of https://code.grnet.gr/git/astakos into 0.5
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 10 Apr 2012 13:13:41 +0000 (16:13 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 10 Apr 2012 13:13:41 +0000 (16:13 +0300)
commitd37e4e21f1ee0fcf01ae71a861322b1c3fcdfa86
tree4079898dd36809040c3f626a674eed2eccde749e
parent23c271b3536e72134a3090fe48cf2e5af7644904
parent176023aaf72179dddcfa4a2f045b145743ef6e4e
Merge branch 'master' of https://code.grnet.gr/git/astakos into 0.5

Conflicts:
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/views.py
snf-astakos-app/README
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/views.py