:Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
authorOlga Brani <olgabrani@grnet.gr>
Tue, 18 Sep 2012 12:30:19 +0000 (15:30 +0300)
committerOlga Brani <olgabrani@grnet.gr>
Tue, 18 Sep 2012 12:30:19 +0000 (15:30 +0300)
commitc3a00daf86d9a5bb461d8bb33f8998aea3ea2913
treedffb72c40621a6c98073e43f12e8c461f3fa2f17
parent5056da3d14bd7e2284844dd9fafa5c7d3769b031
parent1eaeb5b6f7075c82f2ea6f5f30c9d687f9ff1dc6
:Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/templates/im/billing.html
snf-astakos-app/astakos/im/templatetags/filters.py
snf-astakos-app/astakos/im/views.py
snf-astakos-app/astakos/im/templates/im/billing.html
snf-astakos-app/astakos/im/templatetags/filters.py
snf-astakos-app/astakos/im/views.py