Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Mon, 21 Nov 2011 16:46:22 +0000 (18:46 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Mon, 21 Nov 2011 16:46:22 +0000 (18:46 +0200)
commit07c37c5a2d73eb331287640e58968aed777c8e17
tree4206f50be7bc2a14b581bf4bda35b01f3ed626f7
parentbea9e0098f656eed2d31800269ca82d1d9804e4f
parentf7c27d69e635d949b7bb8af64017eb1e7a2e83fb
Merge branch 'master' of https://code.grnet.gr/git/pithos
pithos/im/views.py
pithos/settings.py.dist