Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
authorOlga Brani <olgabrani@grnet.gr>
Fri, 7 Sep 2012 11:26:05 +0000 (14:26 +0300)
committerOlga Brani <olgabrani@grnet.gr>
Fri, 7 Sep 2012 11:26:05 +0000 (14:26 +0300)
commitc78c9908c5186a23e0420d299fb35b1c24ce5cb3
treea51d6eafa92e9799d70cad49bb84d087f37608eb
parent1831a0fe90daf76407d5b7d998b41916df32b864
parenta4db4523c24a11c3000b0c52ad4b346c1bda3219
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/forms.py