Merge branch 'master' into spec-activerecord

Conflicts: require.rb
winton · Feb 13, 2010 · f4714dc · f4714dc
2 parents 4e9df33 + b12421c
commit f4714dc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/require.rb b/require.rb
@@ -4,7 +4,7 @@
 
 Require do
   gem(:active_wrapper, '=0.2.3') { require 'active_wrapper' }
-  gem :require, '=0.2.1'
+  gem :require, '=0.2.2'
   gem(:rake, '=0.8.7') { require 'rake' }
   gem :rspec, '=1.3.0'