Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
authorroot <root@dev84.dev.grnet.gr>
Tue, 25 Sep 2012 13:15:37 +0000 (16:15 +0300)
committerroot <root@dev84.dev.grnet.gr>
Tue, 25 Sep 2012 13:15:37 +0000 (16:15 +0300)
commit1b3db4f03a1ba1475499fb684fd4cf607d065a98
tree7c55515cf891a55d61675b8e895718913303dbfb
parent476fdba1e5ba02c67f142252a7b75d0918a3a9ec
parent39cd6c9281cccb24b490f1f120ff58e113f2da70
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev

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