Revert "Merge."
authorThadeu Lima de Souza Cascardo <cascardo@vespa.holoscopio.com>
Tue, 9 Oct 2007 03:32:15 +0000 (00:32 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@vespa.holoscopio.com>
Tue, 9 Oct 2007 03:32:15 +0000 (00:32 -0300)
commit052df2dcadc94ccfba46087f526fff4496902fa0
tree99afe082a678981385983e27f6ada5dda475fb88
parent0052f08cb17810c9e5b79df2c086109e58909c9b
Revert "Merge."

This reverts commit 0052f08cb17810c9e5b79df2c086109e58909c9b.
This was a merge that simply removed some changes that we wanted to
really merge. Things that push may do if you don't know how to use it.
controllers.py
eventos/models.py
templates/base.html
templates/dados_palestrante.html
templates/programacao.html
urls.py
views.py