Merge branch '0.6.4' into dev
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 25 Sep 2012 13:12:17 +0000 (16:12 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 25 Sep 2012 13:12:17 +0000 (16:12 +0300)
commit39cd6c9281cccb24b490f1f120ff58e113f2da70
tree26eaf98f0d34f3d6ac36ac36feaf3672b7d933da
parenta2436cb60e8d6386d50f5704423c9fbcf4822699
parent789bcaf9330d41c15c6ca154c6a19986f386cb0a
Merge branch '0.6.4' into dev

Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/views.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/migrations/0023_populate_resource_data.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
snf-astakos-app/astakos/im/views.py