Merge branch 'master' into 0.5
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 3 Apr 2012 13:50:13 +0000 (16:50 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 3 Apr 2012 13:50:13 +0000 (16:50 +0300)
1  2 
snf-astakos-app/astakos/im/settings.py