Merge branch 'master' into spec-activerecord

Conflicts: config/gemsets.yml
winton · Jan 2, 2011 · b51a78a · b51a78a
2 parents 2800b11 + 11fdcaf
commit b51a78a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/config/gemsets.yml b/config/gemsets.yml
@@ -1,5 +1,5 @@
 gem_template:
   rake: >=0.8.7
-  rspec: <2
+  rspec: ~>1.0
   default:
-    active_wrapper: =0.3.4
+    active_wrapper: =0.3.4