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)
Conflicts:

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


No differences found