Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
authorOlga Brani <olgabrani@grnet.gr>
Mon, 27 Aug 2012 12:33:35 +0000 (15:33 +0300)
committerOlga Brani <olgabrani@grnet.gr>
Mon, 27 Aug 2012 12:33:35 +0000 (15:33 +0300)
commit025b4028b1ed5bba923ecfb1d57bcf96c75ebf62
tree0ba01c4e3e7fe40434b9c0af3159a902d4b11b25
parent304acb6023e02490ff888bf1e6bd49ba23908625
parentf6e8cca49c47b1d48a2adae9effc2deaf9afa183
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_list.html