Merge branch 'master' into mybranch mybranch
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Fri, 7 Nov 2008 21:46:52 +0000 (19:46 -0200)
committerThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Fri, 7 Nov 2008 21:46:52 +0000 (19:46 -0200)
commit89ac8daa7f099aef26e364f7137c5577c6758443
treebd6e64834b96817fa1981761494547cc39fc5547
parentdeadf34b1bdeb533acfe462882439ed2e589dcee
parentdf9c30c4fa32e2f14e5c8b58e30b9dcf534b90ab
Merge branch 'master' into mybranch
eventos/templates/eventos/talk-improve.html
eventos/views.py