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)
commitec7778db0aed2979fadad310d2d1aec9f2d876cb
tree686750c2546a1a8c488a240c490f7b4b3288f848
parent0c1f6cdb42d06f3535204a1b7a2660ffa2f32e1b
parentc3a00daf86d9a5bb461d8bb33f8998aea3ea2913
Merge branch '0.6.4' into dev
snf-astakos-app/astakos/im/views.py