Merge branch 'master' of git://hammerboy.no-ip.org/eventmanager

author www-data <www-data@mail.holoscopio.com>

Thu, 27 Sep 2007 16:08:22 +0000 (13:08 -0300)

committer www-data <www-data@mail.holoscopio.com>

Thu, 27 Sep 2007 16:08:22 +0000 (13:08 -0300)
author www-data <www-data@mail.holoscopio.com>
Thu, 27 Sep 2007 16:08:22 +0000 (13:08 -0300)
committer www-data <www-data@mail.holoscopio.com>
Thu, 27 Sep 2007 16:08:22 +0000 (13:08 -0300)
diff --cc templates/base.html
Simple merge
diff --cc views.py
Simple merge
author	www-data <www-data@mail.holoscopio.com>
	Thu, 27 Sep 2007 16:08:22 +0000 (13:08 -0300)
committer	www-data <www-data@mail.holoscopio.com>
	Thu, 27 Sep 2007 16:08:22 +0000 (13:08 -0300)
		1	2
templates/base.html	patch \|	diff1 \|	diff2 \|	blob \| history
views.py	patch \|	diff1 \|	diff2 \|	blob \| history