Tom Hughes a37e1b8f70 Merge branch 'master' into openid ... Conflicts: app/views/user/login.html.erb		2011-05-22 18:01:15 +01:00
..
controllers	Start ROTS for user login tests as well as creation tests	2011-05-21 13:35:15 +01:00
helpers	Merge branch 'master' into openid	2011-05-22 18:01:15 +01:00
models	Merge branch 'master' into openid	2011-05-21 12:14:56 +01:00
views	Merge branch 'master' into openid	2011-05-22 18:01:15 +01:00