Merge branch 'master' of git://github.com/rails/rails

Conflicts:
	activemodel/README
	activemodel/lib/active_model/errors.rb
	activemodel/lib/active_model/serialization.rb
	railties/guides/source/3_0_release_notes.textile

1 files changed, 0 insertions, 1 deletions

diff --git a/Gemfile b/Gemfile
index 68e6487e2c..051607c0f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,6 @@ if RUBY_VERSION < '1.9'
 end
 
 # AR
-gem "arel", ">= 0.2.0"
 gem "sqlite3-ruby", ">= 1.2.5"
 
 group :test do