Merge branch 'master' of https://code.grnet.gr/git/astakos
[astakos] / snf-astakos-app / conf / 20-snf-astakos-app-settings.conf~
2012-05-24 Olga BraniStyle fixes