Tom Hughes d36fab2913 Merge branch 'master' into openid ... Conflicts: app/controllers/user_controller.rb app/views/user/login.html.erb config/locales/en.yml		2010-04-20 00:41:03 +01:00
..
gems/composite_primary_keys-2.2.2	Normalise line endings.	2010-04-19 15:17:18 +01:00
generators/daemon	Import the daemon generator as the SVN external never works.	2008-08-07 17:46:34 +00:00
plugins	Merge branch 'master' into openid	2010-04-20 00:41:03 +01:00