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)
commit8df55b7a996ee9ae45a372444aebbd9701c6eb92
tree16da8a13fbaac525e86135a14ff9785574979802
parent21f89374bf3b8f9acebe14cc43a3fb7c0d4c3f81
parent60e78c999a766ddb70ffe147c62c574a64a3f561
Merge branch 'master' of https://code.grnet.gr/git/astakos

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