Jonas Nicklas and Nicklas Ramhöj 7fb5a1da3a Merge remote branch 'cavalle/object_pollution' ... Conflicts: spec/rspec/features_spec.rb		2011-03-31 18:05:58 +02:00
..
features.rb	Merge remote branch 'cavalle/object_pollution'	2011-03-31 18:05:58 +02:00
matchers.rb	Added have_select and have_table matchers	2011-03-25 10:46:31 +00:00