Merge.
authorThadeu Lima de Souza Cascardo <cascardo@mail.holoscopio.com>
Mon, 8 Oct 2007 14:22:01 +0000 (11:22 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@mail.holoscopio.com>
Mon, 8 Oct 2007 14:22:01 +0000 (11:22 -0300)
commit0052f08cb17810c9e5b79df2c086109e58909c9b
tree70b031644d7f55437a18e197f082320fc5c79262
parentc0e772bc717b052cacce4b71edc87cb1b424bf55
Merge.
controllers.py
eventos/models.py
templates/base.html
templates/dados_palestrante.html
templates/programacao.html
urls.py
views.py