Merge branch 'master' of /var/www/emsl2007/eventmanager/
authorThadeu Lima de Souza Cascardo <cascardo@mail.holoscopio.com>
Fri, 28 Sep 2007 11:49:45 +0000 (08:49 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@mail.holoscopio.com>
Fri, 28 Sep 2007 11:49:45 +0000 (08:49 -0300)
commitd0f8a3ab75f2c71f442beb5fd5cb9852ac75a4d9
tree09036032be6d86d205548964474a5ee950758622
parent37dc92b1127772467561f5b241e724ce0a1266e7
parent11faa820abeb69b688db5076aa4c1cc663dfeb53
Merge branch 'master' of /var/www/emsl2007/eventmanager/

Conflicts:

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