Merge branch 'uiredesign' of ../evan into uiredesign

author sarven <csarven@plantard.controlezvous.ca>

Thu, 15 Jan 2009 23:05:57 +0000 (23:05 +0000)

committer sarven <csarven@plantard.controlezvous.ca>

Thu, 15 Jan 2009 23:05:57 +0000 (23:05 +0000)
author sarven <csarven@plantard.controlezvous.ca>
Thu, 15 Jan 2009 23:05:57 +0000 (23:05 +0000)
committer sarven <csarven@plantard.controlezvous.ca>
Thu, 15 Jan 2009 23:05:57 +0000 (23:05 +0000)
diff --cc actions/login.php
Simple merge
diff --cc lib/action.php
Simple merge
author	sarven <csarven@plantard.controlezvous.ca>
	Thu, 15 Jan 2009 23:05:57 +0000 (23:05 +0000)
committer	sarven <csarven@plantard.controlezvous.ca>
	Thu, 15 Jan 2009 23:05:57 +0000 (23:05 +0000)
		1	2
actions/login.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history