Merge branch 'master' into newstyles
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 30 Jul 2012 15:34:22 +0000 (18:34 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 30 Jul 2012 15:34:22 +0000 (18:34 +0300)
commit2746146a3914b02927bc3943bf94c7887ba94d9b
treef6a70b71b9dcd9fe1bbe251950870c4b49d946c6
parentd94840030c7c874c8df2c846f196e2be4661d27d
parent94068975d53c06217a9195c19d6d245011f0851c
Merge branch 'master' into newstyles
snf-astakos-app/astakos/im/views.py