Mike Gaffney 0c9944c4d8 Merge commit 'eddd97936' ... Conflicts: spec/integration/rails/test/integration/webrat_test.rb		2009-06-15 22:40:02 -05:00
..
merb	Integration tests for Merb file uploads	2009-04-24 14:11:49 -07:00
rack	Commenting out failing Rack spec for now	2009-06-15 00:17:44 -04:00
rails	Merge commit 'eddd97936'	2009-06-15 22:40:02 -05:00
sinatra	Comment out redgreen because it has issues on Ruby 1.9	2009-06-15 00:03:46 -04:00