Merge git://hammerboy.no-ip.org/eventmanager
authorwww-data <www-data@mail.holoscopio.com>
Wed, 26 Sep 2007 05:15:32 +0000 (02:15 -0300)
committerwww-data <www-data@mail.holoscopio.com>
Wed, 26 Sep 2007 05:15:32 +0000 (02:15 -0300)
commit221f9b712a6b693ac9593b7997fa63263d3e3ae9
tree09d5b113f6e408f8e2f684bfa1a361b7969d0a09
parentc821835265246633aa6736de9640d692b8b335f2
parentc9beb087b370ebf660c58f32faf10b08d17ac49e
Merge git://hammerboy.no-ip.org/eventmanager

Conflicts:

forms.py
settings.py
templates/editar_trabalho.html
templates/inscricao.html
templates/meus_trabalhos.html
views.py
settings.py
views.py