Merge branch 'master' into spec-activerecord

Conflicts: require.rb
winton · Mar 11, 2010 · 05d6e03 · 05d6e03
2 parents 865176f + 77271f3
commit 05d6e03
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.5'
+  gem :require, '=0.2.6'
   gem(:rake, '=0.8.7') { require 'rake' }
   gem :rspec, '=1.3.0'