merge with 0.6.4
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 25 Sep 2012 13:07:49 +0000 (16:07 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 25 Sep 2012 13:07:49 +0000 (16:07 +0300)
commita2436cb60e8d6386d50f5704423c9fbcf4822699
tree6354d5fc603d34b27ad67f6375a59087bf03f73d
parent0f42ee35d65349c78b01edbba1674b3848b5d2c5
merge with 0.6.4
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/functions.py