Merge branch 'dev' into 0.6.4
authorSofia Papagiannaki <papagian@gmail.com>
Fri, 14 Sep 2012 15:05:10 +0000 (18:05 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Fri, 14 Sep 2012 15:05:10 +0000 (18:05 +0300)
commit5a03a01a2789d9bb45e3bc7312916579080d67b1
treefc554abecd4e8bb3320f6534c4386624edbe66c5
parent2b1a5f5de9b3a6238a81c3d2edaf7430139d2ec7
parentf2d3fe965d2ff2e856cffab00fbb9552bfac036e
Merge branch 'dev' into 0.6.4
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html