Fix bad merge master
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Fri, 7 Nov 2008 21:59:34 +0000 (19:59 -0200)
committerThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Fri, 7 Nov 2008 21:59:34 +0000 (19:59 -0200)
commit5a28c5b273ecacf5a9923f6ecd23dba7de764a39
tree7caedff9cbb854956782c60be96b268f2bde2539
parent89ac8daa7f099aef26e364f7137c5577c6758443
Fix bad merge
eventos/views.py