Merge branch 'master' of ssh://hammerboy/home/lincoln/pessoal/eventmanager
authorLincoln de Sousa <lincoln@archlinux-br.org>
Wed, 15 Aug 2007 22:51:50 +0000 (19:51 -0300)
committerLincoln de Sousa <lincoln@archlinux-br.org>
Wed, 15 Aug 2007 22:51:50 +0000 (19:51 -0300)
1  2 
forms.py
views.py

diff --cc forms.py
Simple merge
diff --cc views.py
Simple merge