Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
authorOlga Brani <olgabrani@grnet.gr>
Wed, 14 Nov 2012 10:27:18 +0000 (12:27 +0200)
committerOlga Brani <olgabrani@grnet.gr>
Wed, 14 Nov 2012 10:27:18 +0000 (12:27 +0200)
commitd1a767f79504b98b4d64656469ae75cd01cc8f55
treecb1ac677353d812cf2b70de08bbdc0b6fe5bcb2b
parent509d894e9c18d7a84b4f94f6794999a2d3c7d33a
parent26087fb9892f901fdabbb2f085039bad068ae6f3
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html
snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.BACKUP.21131.html
snf-astakos-app/astakos/im/activation_backends.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html
snf-astakos-app/astakos/im/util.py