Merge branch 'dev' into 0.6.4
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 4 Oct 2012 09:53:06 +0000 (12:53 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 4 Oct 2012 09:53:06 +0000 (12:53 +0300)
commitc9015cf619f72c01a92117b9d4775afc256da2d1
tree5eae01c5d2cd2c3639665ff63380ff3340e52a9c
parent51945a9ef9cec580e2b42079496cad8827b1dd70
parent9eafaa32839fce274c7ac1e34bd18d4e25df61d3
Merge branch 'dev' into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
snf-astakos-app/astakos/im/context_processors.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/synnefo_settings.py