Merge branch 'master' of https://code.grnet.gr/git/astakos astakos/v0.7.2
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 2 Aug 2012 17:04:24 +0000 (20:04 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 2 Aug 2012 17:04:24 +0000 (20:04 +0300)
Conflicts:
snf-astakos-app/astakos/im/forms.py


No differences found