Merge branch 'gjmurakami-10gen-1.x-stable-shoulda-matchers' into 1.x-stable

Author: gjmurakami-10gen

Gemfile

@@ -21,8 +21,11 @@ group :testing do
   gem 'test-unit'
   gem 'mocha', ">=0.13.0", :require => 'mocha/setup'
   gem 'shoulda', ">=3.3.2"
-  gem 'shoulda-matchers', '~>1.0'
-
+  if RUBY_VERSION >= '1.9.2'
+    gem 'shoulda-matchers', '~>2.0'
+  else
+    gem 'shoulda-matchers', '~>1.0'
+  end
   gem 'sfl'
   if RUBY_VERSION > '1.8.7' || RUBY_PLATFORM =~ /java/
     gem 'coveralls', :require => false