Merge branch 'master' of https://code.grnet.gr/git/astakos into cloudbar
authorSofia Papagiannaki <papagian@gmail.com>
Sun, 26 Feb 2012 16:00:48 +0000 (18:00 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Sun, 26 Feb 2012 16:00:48 +0000 (18:00 +0200)
commit6e4c609e60311084773f99d2964d3c03f54d87ca
tree1f2248667577a10bf2f10798e955b851ba02d988
parentded3a1b777d977969c4cb00b13cb798b02c68cc4
parentd01e7b221605c24eee25f405296beec0156cde0e
Merge branch 'master' of https://code.grnet.gr/git/astakos into cloudbar
snf-astakos-app/astakos/im/settings.py