2 Commits

Author	SHA1	Message	Date
james	37bbcf312b	- Name the science fair login "Science Fair" not "Other Fair" ... - Since science fairs are attached to users now, it doesn't make sense to allow the user to choose from a list of fairs, since there could be more than one with access to a fair (and we don't want to start putting names in there), so fairs can login with a user/pass like everyone else.	2009-11-06 02:07:52 +00:00
james	f963dbf276	Merge all changes from branch r1284:1498 into trunk	2009-09-09 00:26:12 +00:00