Tom Hughes 11aff90f63 Merge branch 'master' into openid ... Conflicts: app/controllers/user_controller.rb app/views/user/login.html.erb public/stylesheets/common.css		2011-02-10 14:10:19 +00:00
..
fixtures	Merge branch 'master' into openid	2010-10-17 10:59:29 +01:00
functional	Add support for conditional deletes in changeset uploads	2010-12-15 23:59:06 +00:00
integration	Fixup openid test to reflect changes merged from master	2010-10-05 00:45:03 +01:00
unit	Initial work on support for multiple editors	2010-11-29 12:20:21 +00:00
test_helper.rb	Merge branch 'master' into openid	2011-02-10 14:10:19 +00:00