Merge branch '0.6.4' into dev
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 18 Sep 2012 12:35:41 +0000 (15:35 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 18 Sep 2012 12:35:41 +0000 (15:35 +0300)
1  2 
snf-astakos-app/astakos/im/views.py

Simple merge