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

Gemfile

@@ -9,6 +9,7 @@ gem "mocha", ">= 0.9.8"
 group :mri do
   gem 'json'
   gem 'yajl-ruby'
+  gem "nokogiri", ">= 1.4.0"
 
   if RUBY_VERSION < '1.9'
     gem "system_timer"
@@ -19,7 +20,7 @@ group :mri do
 end
 
 # AR
-gem "sqlite3-ruby", ">= 1.2.5", :require => 'sqlite3'
+gem "sqlite3-ruby", "= 1.3.0.beta.2", :require => 'sqlite3'
 
 group :db do
   gem "pg", ">= 0.9.0"

actionmailer/CHANGELOG

@@ -1,3 +1,7 @@
+* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 [ML]
+
+* Added ability to pass Proc objects to the defaults hash [ML]
+
 *Rails 3.0.0 [beta 3] (April 13th, 2010)*
 
 * Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML]

actionmailer/actionmailer.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   s.add_dependency('actionpack',  version)
-  s.add_dependency('mail',        '~> 2.2.0')
+  s.add_dependency('mail',        '~> 2.2.1')
   s.add_dependency('text-format', '~> 1.0.0')
 end