Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 7 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index 7fbf57ba0b..a51c560232 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 path File.dirname(__FILE__)
-source 'http://gemcutter.org'
+source 'http://rubygems.org'
 
+gem "arel", :git => "git://github.com/rails/arel.git"
 gem "rails", "3.0.0.beta1"
 
 gem "rake",  ">= 0.8.7"
@@ -14,7 +15,7 @@ end
 gem "sqlite3-ruby", ">= 1.2.5", :require => 'sqlite3'
 
 group :test do
-  gem "pg", ">= 0.8.0"
+  gem "pg", ">= 0.9.0"
   gem "mysql", ">= 2.8.1"
 end
 
@@ -22,6 +23,10 @@ end
 gem "rack-test", "0.5.3", :require => 'rack/test'
 gem "RedCloth", ">= 4.2.2"
 
+group :documentation do
+  gem 'rdoc', '2.1'
+end
+
 if ENV['CI']
   gem "nokogiri", ">= 1.4.0"