Added by Olga Brani over 11 years ago
Merge branch '0.6.4' into devel-0.13
Conflicts: snf-astakos-app/astakos/im/views.py