Jonas Nicklas 555aeebd89 Merge branch 'master' of git://github.com/rshurts/capybara into rshurts-master ... Conflicts: lib/capybara/rspec/matchers.rb spec/rspec/matchers_spec.rb		2012-07-09 15:31:34 +02:00
..
features.rb	Merge remote branch 'cavalle/object_pollution'	2011-03-31 18:05:58 +02:00
matchers.rb	Merge branch 'master' of git://github.com/rshurts/capybara into rshurts-master	2012-07-09 15:31:34 +02:00