diff --git a/vendor/rails/actionmailer/CHANGELOG b/vendor/rails/actionmailer/CHANGELOG
index bdae0d4d..c873cbf1 100644
--- a/vendor/rails/actionmailer/CHANGELOG
+++ b/vendor/rails/actionmailer/CHANGELOG
@@ -1,3 +1,8 @@
+*2.1.1 (September 4th, 2008)*
+
+* Included in Rails 2.1.1
+
+
 *2.1.0 (May 31st, 2008)*
 
 * Fixed that a return-path header would be ignored #7572 [joost]
diff --git a/vendor/rails/actionmailer/Rakefile b/vendor/rails/actionmailer/Rakefile
index c09526cb..db785c73 100755
--- a/vendor/rails/actionmailer/Rakefile
+++ b/vendor/rails/actionmailer/Rakefile
@@ -5,6 +5,8 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
+require 'rake/contrib/rubyforgepublisher'
+
 require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -35,7 +37,7 @@ Rake::RDocTask.new { |rdoc|
   rdoc.title    = "Action Mailer -- Easy email delivery and testing"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
   rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/action_mailer.rb')
   rdoc.rdoc_files.include('lib/action_mailer/*.rb')
@@ -55,7 +57,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.1.1' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
@@ -76,12 +78,13 @@ end
 
 desc "Publish the API documentation"
 task :pgem => [:package] do 
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/am", "doc").upload
+  Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/am", "doc").upload
 end
 
 desc "Publish the release files to RubyForge."
diff --git a/vendor/rails/actionmailer/lib/action_mailer/base.rb b/vendor/rails/actionmailer/lib/action_mailer/base.rb
index e0651321..51fc6032 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/base.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/base.rb
@@ -530,7 +530,7 @@ module ActionMailer #:nodoc:
       end
 
       def render_message(method_name, body)
-        render :file => method_name, :body => body
+        render :file => method_name, :body => body, :use_full_path => true
       end
 
       def render(opts)
@@ -538,6 +538,7 @@ module ActionMailer #:nodoc:
         if opts[:file] && opts[:file] !~ /\//
           opts[:file] = "#{mailer_name}/#{opts[:file]}"
         end
+        opts[:use_full_path] = true
         initialize_template_class(body).render(opts)
       end
 
diff --git a/vendor/rails/actionmailer/lib/action_mailer/version.rb b/vendor/rails/actionmailer/lib/action_mailer/version.rb
index c35b648b..4c407b3f 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/version.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/actionmailer/test/abstract_unit.rb b/vendor/rails/actionmailer/test/abstract_unit.rb
index 9b7a4661..107b2e8b 100644
--- a/vendor/rails/actionmailer/test/abstract_unit.rb
+++ b/vendor/rails/actionmailer/test/abstract_unit.rb
@@ -30,13 +30,20 @@ class Net::SMTP
   end
 end
 
-# Wrap tests that use Mocha and skip if unavailable.
-def uses_mocha(test_name)
-  gem 'mocha', ">=0.5"
-  require 'stubba'
+def uses_gem(gem_name, test_name, version = '> 0')
+  require 'rubygems'
+  gem gem_name.to_s, version
+  require gem_name.to_s
   yield
-rescue Gem::LoadError
-  $stderr.puts "Skipping #{test_name} tests (Mocha >= 0.5 is required). `gem install mocha` and try again."
+rescue LoadError
+  $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again."
+end
+
+# Wrap tests that use Mocha and skip if unavailable.
+unless defined? uses_mocha
+  def uses_mocha(test_name, &block)
+    uses_gem('mocha', test_name, '>= 0.5.5', &block)
+  end
 end
 
 def set_delivery_method(delivery_method)
diff --git a/vendor/rails/actionpack/CHANGELOG b/vendor/rails/actionpack/CHANGELOG
index cb684a92..f44fc68f 100644
--- a/vendor/rails/actionpack/CHANGELOG
+++ b/vendor/rails/actionpack/CHANGELOG
@@ -1,3 +1,20 @@
+*2.1.1 (September 4th, 2008)*
+
+* All 2xx requests are considered successful [Josh Peek]
+
+* Deprecate the limited follow_redirect in functional tests.  If you wish to follow redirects, use integration tests. [Michael Koziarski]
+
+* Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host along with the source or per-request proc's won't run [DHH]
+
+* Deprecate define_javascript_functions, javascript_include_tag and friends are much better [Michael Koziarski]
+
+* Fix polymorphic_url with singleton resources.  #461 [Tammer Saleh]
+
+* Deprecate ActionView::Base.erb_variable. Use the concat helper method instead of appending to it directly.  [Jeremy Kemper]
+
+* Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and HTTP_X_FORWARDED_FOR doesn't match (not just if they're both present) [Mark Imbriaco, Bradford Folkens]
+
+
 *2.1.0 (May 31st, 2008)*
 
 * InstanceTag#default_time_from_options overflows to DateTime [Geoff Buesing]
diff --git a/vendor/rails/actionpack/Rakefile b/vendor/rails/actionpack/Rakefile
index b37f756c..3ea18cb1 100644
--- a/vendor/rails/actionpack/Rakefile
+++ b/vendor/rails/actionpack/Rakefile
@@ -5,6 +5,8 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
+require 'rake/contrib/rubyforgepublisher'
+
 require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -49,12 +51,14 @@ Rake::RDocTask.new { |rdoc|
   rdoc.title    = "Action Pack -- On rails from request to response"
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
   if ENV['DOC_FILES'] 
     rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
   else
     rdoc.rdoc_files.include('README', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
-    rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_files.include(Dir['lib/**/*.rb'] -
+                            Dir['lib/*/vendor/**/*.rb'])
+    rdoc.rdoc_files.exclude('lib/actionpack.rb')
   end
 }
 
@@ -76,7 +80,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.1.1' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
@@ -132,13 +136,13 @@ task :update_js => [ :update_scriptaculous ]
 
 desc "Publish the API documentation"
 task :pgem => [:package] do 
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
+  Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/ap", "doc").upload
+  Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ap", "doc").upload
 end
 
 desc "Publish the release files to RubyForge."
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb
index c5fc6c79..3deda0b4 100644
--- a/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb
@@ -97,7 +97,7 @@ module ActionController
                 value['controller'] = value['controller'].to_s
                 if key == :actual && value['controller'].first != '/' && !value['controller'].include?('/')
                   new_controller_path = ActionController::Routing.controller_relative_to(value['controller'], @controller.class.controller_path)
-                  value['controller'] = new_controller_path if value['controller'] != new_controller_path && ActionController::Routing.possible_controllers.include?(new_controller_path)
+                  value['controller'] = new_controller_path if value['controller'] != new_controller_path && ActionController::Routing.possible_controllers.include?(new_controller_path) && @response.redirected_to.is_a?(Hash)
                 end
                 value['controller'] = value['controller'][1..-1] if value['controller'].first == '/' # strip leading hash
               end
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb
index d3594e71..65e60bd4 100644
--- a/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb
@@ -398,47 +398,31 @@ module ActionController
       #   # The same, but shorter.
       #   assert_select "ol>li", 4
       def assert_select_rjs(*args, &block)
-        rjs_type = nil
-        arg      = args.shift
+        rjs_type = args.first.is_a?(Symbol) ? args.shift : nil
+        id       = args.first.is_a?(String) ? args.shift : nil
 
         # If the first argument is a symbol, it's the type of RJS statement we're looking
         # for (update, replace, insertion, etc). Otherwise, we're looking for just about
         # any RJS statement.
-        if arg.is_a?(Symbol)
-          rjs_type = arg
-
+        if rjs_type
           if rjs_type == :insert
-            arg = args.shift
-            insertion = "insert_#{arg}".to_sym
-            raise ArgumentError, "Unknown RJS insertion type #{arg}" unless RJS_STATEMENTS[insertion]
+            position  = args.shift
+            insertion = "insert_#{position}".to_sym
+            raise ArgumentError, "Unknown RJS insertion type #{position}" unless RJS_STATEMENTS[insertion]
             statement = "(#{RJS_STATEMENTS[insertion]})"
           else
             raise ArgumentError, "Unknown RJS statement type #{rjs_type}" unless RJS_STATEMENTS[rjs_type]
             statement = "(#{RJS_STATEMENTS[rjs_type]})"
           end
-          arg = args.shift
         else
           statement = "#{RJS_STATEMENTS[:any]}"
         end
 
         # Next argument we're looking for is the element identifier. If missing, we pick
-        # any element.
-        if arg.is_a?(String)
-          id = Regexp.quote(arg)
-          arg = args.shift
-        else
-          id = "[^\"]*"
-        end
-
-        pattern =
-          case rjs_type
-            when :chained_replace, :chained_replace_html
-              Regexp.new("\\$\\(\"#{id}\"\\)#{statement}\\(#{RJS_PATTERN_HTML}\\)", Regexp::MULTILINE)
-            when :remove, :show, :hide, :toggle
-              Regexp.new("#{statement}\\(\"#{id}\"\\)")
-            else
-              Regexp.new("#{statement}\\(\"#{id}\", #{RJS_PATTERN_HTML}\\)", Regexp::MULTILINE)
-          end
+        # any element, otherwise we replace it in the statement.
+        pattern = Regexp.new(
+          id ? statement.gsub(RJS_ANY_ID, "\"#{id}\"") : statement
+        )
 
         # Duplicate the body since the next step involves destroying it.
         matches = nil
@@ -447,7 +431,7 @@ module ActionController
             matches = @response.body.match(pattern)
           else
             @response.body.gsub(pattern) do |match|
-              html = unescape_rjs($2)
+              html = unescape_rjs(match)
               matches ||= []
               matches.concat HTML::Document.new(html).root.children.select { |n| n.tag? }
               ""
@@ -577,27 +561,23 @@ module ActionController
 
       protected
         unless const_defined?(:RJS_STATEMENTS)
-          RJS_STATEMENTS = {
-            :replace              => /Element\.replace/,
-            :replace_html         => /Element\.update/,
-            :chained_replace      => /\.replace/,
-            :chained_replace_html => /\.update/,
-            :remove               => /Element\.remove/,
-            :show                 => /Element\.show/,
-            :hide                 => /Element\.hide/,
-            :toggle                 => /Element\.toggle/
+          RJS_PATTERN_HTML  = "\"((\\\\\"|[^\"])*)\""
+          RJS_ANY_ID        = "\"([^\"])*\""
+          RJS_STATEMENTS    = {
+            :chained_replace      => "\\$\\(#{RJS_ANY_ID}\\)\\.replace\\(#{RJS_PATTERN_HTML}\\)",
+            :chained_replace_html => "\\$\\(#{RJS_ANY_ID}\\)\\.update\\(#{RJS_PATTERN_HTML}\\)",
+            :replace_html         => "Element\\.update\\(#{RJS_ANY_ID}, #{RJS_PATTERN_HTML}\\)",
+            :replace              => "Element\\.replace\\(#{RJS_ANY_ID}, #{RJS_PATTERN_HTML}\\)"
           }
-          RJS_INSERTIONS = [:top, :bottom, :before, :after]
-          RJS_INSERTIONS.each do |insertion|
-            RJS_STATEMENTS["insert_#{insertion}".to_sym] = Regexp.new(Regexp.quote("new Insertion.#{insertion.to_s.camelize}"))
+          [:remove, :show, :hide, :toggle].each do |action|
+            RJS_STATEMENTS[action] = "Element\\.#{action}\\(#{RJS_ANY_ID}\\)"
           end
+          RJS_INSERTIONS = ["top", "bottom", "before", "after"]
+          RJS_INSERTIONS.each do |insertion|
+            RJS_STATEMENTS["insert_#{insertion}".to_sym] = "Element.insert\\(#{RJS_ANY_ID}, \\{ #{insertion}: #{RJS_PATTERN_HTML} \\}\\)"
+          end
+          RJS_STATEMENTS[:insert_html] = "Element.insert\\(#{RJS_ANY_ID}, \\{ (#{RJS_INSERTIONS.join('|')}): #{RJS_PATTERN_HTML} \\}\\)"
           RJS_STATEMENTS[:any] = Regexp.new("(#{RJS_STATEMENTS.values.join('|')})")
-          RJS_STATEMENTS[:insert_html] = Regexp.new(RJS_INSERTIONS.collect do |insertion|
-            Regexp.quote("new Insertion.#{insertion.to_s.camelize}")
-          end.join('|'))
-          RJS_PATTERN_HTML = /"((\\"|[^"])*)"/
-          RJS_PATTERN_EVERYTHING = Regexp.new("#{RJS_STATEMENTS[:any]}\\(\"([^\"]*)\", #{RJS_PATTERN_HTML}\\)",
-                                              Regexp::MULTILINE)
           RJS_PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
         end
 
@@ -611,8 +591,8 @@ module ActionController
             root = HTML::Node.new(nil)
 
             while true
-              next if body.sub!(RJS_PATTERN_EVERYTHING) do |match|
-                html = unescape_rjs($3)
+              next if body.sub!(RJS_STATEMENTS[:any]) do |match|
+                html = unescape_rjs(match)
                 matches = HTML::Document.new(html).root.children.select { |n| n.tag? }
                 root.children.concat matches
                 ""
diff --git a/vendor/rails/actionpack/lib/action_controller/base.rb b/vendor/rails/actionpack/lib/action_controller/base.rb
index a036600c..d0c70a79 100755
--- a/vendor/rails/actionpack/lib/action_controller/base.rb
+++ b/vendor/rails/actionpack/lib/action_controller/base.rb
@@ -613,8 +613,9 @@ module ActionController #:nodoc:
       #
       # This takes the current URL as is and only exchanges the action. In contrast, <tt>url_for :action => 'print'</tt>
       # would have slashed-off the path components after the changed action.
-      def url_for(options = nil) #:doc:
-        case options || {}
+      def url_for(options = {})
+        options ||= {}
+        case options
           when String
             options
           when Hash
@@ -743,6 +744,9 @@ module ActionController #:nodoc:
       #   # Renders the template located in [TEMPLATE_ROOT]/weblog/show.r(html|xml) (in Rails, app/views/weblog/show.erb)
       #   render :template => "weblog/show"
       #
+      #   # Renders the template with a local variable
+      #   render :template => "weblog/show", :locals => {:customer => Customer.new}
+      #
       # === Rendering a file
       #
       # File rendering works just like action rendering except that it takes a filesystem path. By default, the path
@@ -865,7 +869,7 @@ module ActionController #:nodoc:
             render_for_file(file, options[:status], options[:use_full_path], options[:locals] || {})
 
           elsif template = options[:template]
-            render_for_file(template, options[:status], true)
+            render_for_file(template, options[:status], true, options[:locals] || {})
 
           elsif inline = options[:inline]
             add_variables_to_assigns
@@ -1147,7 +1151,7 @@ module ActionController #:nodoc:
 
       def log_processing
         if logger && logger.info?
-          logger.info "\n\nProcessing #{controller_class_name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]"
+          logger.info "\n\nProcessing #{self.class.name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]"
           logger.info "  Session ID: #{@_session.session_id}" if @_session and @_session.respond_to?(:session_id)
           logger.info "  Parameters: #{respond_to?(:filter_parameters) ? filter_parameters(params).inspect : params.inspect}"
         end
diff --git a/vendor/rails/actionpack/lib/action_controller/dispatcher.rb b/vendor/rails/actionpack/lib/action_controller/dispatcher.rb
index 6e1e7a26..4389b296 100644
--- a/vendor/rails/actionpack/lib/action_controller/dispatcher.rb
+++ b/vendor/rails/actionpack/lib/action_controller/dispatcher.rb
@@ -135,7 +135,7 @@ module ActionController
     # be reloaded on the next request without restarting the server.
     def cleanup_application
       ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
       ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
     end
 
diff --git a/vendor/rails/actionpack/lib/action_controller/filters.rb b/vendor/rails/actionpack/lib/action_controller/filters.rb
index 60d92d9b..155d8b48 100644
--- a/vendor/rails/actionpack/lib/action_controller/filters.rb
+++ b/vendor/rails/actionpack/lib/action_controller/filters.rb
@@ -7,6 +7,200 @@ module ActionController #:nodoc:
       end
     end
 
+    class FilterChain < ActiveSupport::Callbacks::CallbackChain #:nodoc:
+      def append_filter_to_chain(filters, filter_type, &block)
+        pos = find_filter_append_position(filters, filter_type)
+        update_filter_chain(filters, filter_type, pos, &block)
+      end
+
+      def prepend_filter_to_chain(filters, filter_type, &block)
+        pos = find_filter_prepend_position(filters, filter_type)
+        update_filter_chain(filters, filter_type, pos, &block)
+      end
+
+      def create_filters(filters, filter_type, &block)
+        filters, conditions = extract_options(filters, &block)
+        filters.map! { |filter| find_or_create_filter(filter, filter_type, conditions) }
+        filters
+      end
+
+      def skip_filter_in_chain(*filters, &test)
+        filters, conditions = extract_options(filters)
+        filters.each do |filter|
+          if callback = find(filter) then delete(callback) end
+        end if conditions.empty?
+        update_filter_in_chain(filters, :skip => conditions, &test)
+      end
+
+      private
+        def update_filter_chain(filters, filter_type, pos, &block)
+          new_filters = create_filters(filters, filter_type, &block)
+          insert(pos, new_filters).flatten!
+        end
+
+        def find_filter_append_position(filters, filter_type)
+          # appending an after filter puts it at the end of the call chain
+          # before and around filters go before the first after filter in the chain
+          unless filter_type == :after
+            each_with_index do |f,i|
+              return i if f.after?
+            end
+          end
+          return -1
+        end
+
+        def find_filter_prepend_position(filters, filter_type)
+          # prepending a before or around filter puts it at the front of the call chain
+          # after filters go before the first after filter in the chain
+          if filter_type == :after
+            each_with_index do |f,i|
+              return i if f.after?
+            end
+            return -1
+          end
+          return 0
+        end
+
+        def find_or_create_filter(filter, filter_type, options = {})
+          update_filter_in_chain([filter], options)
+
+          if found_filter = find(filter) { |f| f.type == filter_type }
+            found_filter
+          else
+            filter_kind = case
+            when filter.respond_to?(:before) && filter_type == :before
+              :before
+            when filter.respond_to?(:after) && filter_type == :after
+              :after
+            else
+              :filter
+            end
+
+            case filter_type
+            when :before
+              BeforeFilter.new(filter_kind, filter, options)
+            when :after
+              AfterFilter.new(filter_kind, filter, options)
+            else
+              AroundFilter.new(filter_kind, filter, options)
+            end
+          end
+        end
+
+        def update_filter_in_chain(filters, options, &test)
+          filters.map! { |f| block_given? ? find(f, &test) : find(f) }
+          filters.compact!
+
+          map! do |filter|
+            if filters.include?(filter)
+              new_filter = filter.dup
+              new_filter.options.merge!(options)
+              new_filter
+            else
+              filter
+            end
+          end
+        end
+    end
+
+    class Filter < ActiveSupport::Callbacks::Callback #:nodoc:
+      def before?
+        self.class == BeforeFilter
+      end
+
+      def after?
+        self.class == AfterFilter
+      end
+
+      def around?
+        self.class == AroundFilter
+      end
+
+      private
+        def should_not_skip?(controller)
+          if options[:skip]
+            !included_in_action?(controller, options[:skip])
+          else
+            true
+          end
+        end
+
+        def included_in_action?(controller, options)
+          if options[:only]
+            Array(options[:only]).map(&:to_s).include?(controller.action_name)
+          elsif options[:except]
+            !Array(options[:except]).map(&:to_s).include?(controller.action_name)
+          else
+            true
+          end
+        end
+
+        def should_run_callback?(controller)
+          should_not_skip?(controller) && included_in_action?(controller, options) && super
+        end
+    end
+
+    class AroundFilter < Filter #:nodoc:
+      def type
+        :around
+      end
+
+      def call(controller, &block)
+        if should_run_callback?(controller)
+          method = filter_responds_to_before_and_after? ? around_proc : self.method
+
+          # For around_filter do |controller, action|
+          if method.is_a?(Proc) && method.arity == 2
+            evaluate_method(method, controller, block)
+          else
+            evaluate_method(method, controller, &block)
+          end
+        else
+          block.call
+        end
+      end
+
+      private
+        def filter_responds_to_before_and_after?
+          method.respond_to?(:before) && method.respond_to?(:after)
+        end
+
+        def around_proc
+          Proc.new do |controller, action|
+            method.before(controller)
+
+            if controller.send!(:performed?)
+              controller.send!(:halt_filter_chain, method, :rendered_or_redirected)
+            else
+              begin
+                action.call
+              ensure
+                method.after(controller)
+              end
+            end
+          end
+        end
+    end
+
+    class BeforeFilter < Filter #:nodoc:
+      def type
+        :before
+      end
+
+      def call(controller, &block)
+        super
+        if controller.send!(:performed?)
+          controller.send!(:halt_filter_chain, method, :rendered_or_redirected)
+        end
+      end
+    end
+
+    class AfterFilter < Filter #:nodoc:
+      def type
+        :after
+      end
+    end
+
     # Filters enable controllers to run shared pre- and post-processing code for its actions. These filters can be used to do
     # authentication, caching, or auditing before the intended action is performed. Or to do localization or output
     # compression after the action has been performed. Filters have access to the request, response, and all the instance
@@ -245,201 +439,6 @@ module ActionController #:nodoc:
     # filter and controller action will not be run. If +before+ renders or redirects,
     # the second half of +around+ and will still run but +after+ and the
     # action will not. If +around+ fails to yield, +after+ will not be run.
-
-    class FilterChain < ActiveSupport::Callbacks::CallbackChain #:nodoc:
-      def append_filter_to_chain(filters, filter_type, &block)
-        pos = find_filter_append_position(filters, filter_type)
-        update_filter_chain(filters, filter_type, pos, &block)
-      end
-
-      def prepend_filter_to_chain(filters, filter_type, &block)
-        pos = find_filter_prepend_position(filters, filter_type)
-        update_filter_chain(filters, filter_type, pos, &block)
-      end
-
-      def create_filters(filters, filter_type, &block)
-        filters, conditions = extract_options(filters, &block)
-        filters.map! { |filter| find_or_create_filter(filter, filter_type, conditions) }
-        filters
-      end
-
-      def skip_filter_in_chain(*filters, &test)
-        filters, conditions = extract_options(filters)
-        filters.each do |filter|
-          if callback = find(filter) then delete(callback) end
-        end if conditions.empty?
-        update_filter_in_chain(filters, :skip => conditions, &test)
-      end
-
-      private
-        def update_filter_chain(filters, filter_type, pos, &block)
-          new_filters = create_filters(filters, filter_type, &block)
-          insert(pos, new_filters).flatten!
-        end
-
-        def find_filter_append_position(filters, filter_type)
-          # appending an after filter puts it at the end of the call chain
-          # before and around filters go before the first after filter in the chain
-          unless filter_type == :after
-            each_with_index do |f,i|
-              return i if f.after?
-            end
-          end
-          return -1
-        end
-
-        def find_filter_prepend_position(filters, filter_type)
-          # prepending a before or around filter puts it at the front of the call chain
-          # after filters go before the first after filter in the chain
-          if filter_type == :after
-            each_with_index do |f,i|
-              return i if f.after?
-            end
-            return -1
-          end
-          return 0
-        end
-
-        def find_or_create_filter(filter, filter_type, options = {})
-          update_filter_in_chain([filter], options)
-
-          if found_filter = find(filter) { |f| f.type == filter_type }
-            found_filter
-          else
-            filter_kind = case
-            when filter.respond_to?(:before) && filter_type == :before
-              :before
-            when filter.respond_to?(:after) && filter_type == :after
-              :after
-            else
-              :filter
-            end
-
-            case filter_type
-            when :before
-              BeforeFilter.new(filter_kind, filter, options)
-            when :after
-              AfterFilter.new(filter_kind, filter, options)
-            else
-              AroundFilter.new(filter_kind, filter, options)
-            end
-          end
-        end
-
-        def update_filter_in_chain(filters, options, &test)
-          filters.map! { |f| block_given? ? find(f, &test) : find(f) }
-          filters.compact!
-
-          map! do |filter|
-            if filters.include?(filter)
-              new_filter = filter.dup
-              new_filter.options.merge!(options)
-              new_filter
-            else
-              filter
-            end
-          end
-        end
-    end
-
-    class Filter < ActiveSupport::Callbacks::Callback #:nodoc:
-      def before?
-        self.class == BeforeFilter
-      end
-
-      def after?
-        self.class == AfterFilter
-      end
-
-      def around?
-        self.class == AroundFilter
-      end
-
-      private
-        def should_not_skip?(controller)
-          if options[:skip]
-            !included_in_action?(controller, options[:skip])
-          else
-            true
-          end
-        end
-
-        def included_in_action?(controller, options)
-          if options[:only]
-            Array(options[:only]).map(&:to_s).include?(controller.action_name)
-          elsif options[:except]
-            !Array(options[:except]).map(&:to_s).include?(controller.action_name)
-          else
-            true
-          end
-        end
-
-        def should_run_callback?(controller)
-          should_not_skip?(controller) && included_in_action?(controller, options) && super
-        end
-    end
-
-    class AroundFilter < Filter #:nodoc:
-      def type
-        :around
-      end
-
-      def call(controller, &block)
-        if should_run_callback?(controller)
-          method = filter_responds_to_before_and_after? ? around_proc : self.method
-
-          # For around_filter do |controller, action|
-          if method.is_a?(Proc) && method.arity == 2
-            evaluate_method(method, controller, block)
-          else
-            evaluate_method(method, controller, &block)
-          end
-        else
-          block.call
-        end
-      end
-
-      private
-        def filter_responds_to_before_and_after?
-          method.respond_to?(:before) && method.respond_to?(:after)
-        end
-
-        def around_proc
-          Proc.new do |controller, action|
-            method.before(controller)
-
-            if controller.send!(:performed?)
-              controller.send!(:halt_filter_chain, method, :rendered_or_redirected)
-            else
-              begin
-                action.call
-              ensure
-                method.after(controller)
-              end
-            end
-          end
-        end
-    end
-
-    class BeforeFilter < Filter #:nodoc:
-      def type
-        :before
-      end
-
-      def call(controller, &block)
-        super
-        if controller.send!(:performed?)
-          controller.send!(:halt_filter_chain, method, :rendered_or_redirected)
-        end
-      end
-    end
-
-    class AfterFilter < Filter #:nodoc:
-      def type
-        :after
-      end
-    end
-
     module ClassMethods
       # The passed <tt>filters</tt> will be appended to the filter_chain and
       # will execute before the action on this controller is performed.
diff --git a/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb b/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb
index 509fa6a0..7c30bf07 100644
--- a/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb
+++ b/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb
@@ -48,6 +48,9 @@ module ActionController
     #
     #   # calls post_url(post)
     #   polymorphic_url(post) # => "http://example.com/posts/1"
+    #   polymorphic_url([blog, post]) # => "http://example.com/blogs/1/posts/1"
+    #   polymorphic_url([:admin, blog, post]) # => "http://example.com/admin/blogs/1/posts/1"
+    #   polymorphic_url([user, :blog, post]) # => "http://example.com/users/1/blog/posts/1"
     #
     # ==== Options
     #
@@ -83,8 +86,6 @@ module ActionController
         else        [ record_or_hash_or_array ]
       end
 
-      args << format if format
-
       inflection =
         case
         when options[:action].to_s == "new"
@@ -96,6 +97,9 @@ module ActionController
         else
           :singular
         end
+
+      args.delete_if {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+      args << format if format
       
       named_route = build_named_route_call(record_or_hash_or_array, namespace, inflection, options)
       send!(named_route, *args)
@@ -136,11 +140,19 @@ module ActionController
         else
           record = records.pop
           route = records.inject("") do |string, parent|
-            string << "#{RecordIdentifier.send!("singular_class_name", parent)}_"
+            if parent.is_a?(Symbol) || parent.is_a?(String)
+              string << "#{parent}_"
+            else
+              string << "#{RecordIdentifier.send!("singular_class_name", parent)}_"
+            end
           end
         end
 
-        route << "#{RecordIdentifier.send!("#{inflection}_class_name", record)}_"
+        if record.is_a?(Symbol) || record.is_a?(String)
+          route << "#{record}_"
+        else
+          route << "#{RecordIdentifier.send!("#{inflection}_class_name", record)}_"
+        end
 
         action_prefix(options) + namespace + route + routing_type(options).to_s
       end
@@ -163,16 +175,17 @@ module ActionController
         end
       end
       
+      # Remove the first symbols from the array and return the url prefix
+      # implied by those symbols.
       def extract_namespace(record_or_hash_or_array)
-        returning "" do |namespace|
-          if record_or_hash_or_array.is_a?(Array)
-            record_or_hash_or_array.delete_if do |record_or_namespace|
-              if record_or_namespace.is_a?(String) || record_or_namespace.is_a?(Symbol)
-                namespace << "#{record_or_namespace}_"
-              end
-            end
-          end  
+        return "" unless record_or_hash_or_array.is_a?(Array)
+
+        namespace_keys = []
+        while (key = record_or_hash_or_array.first) && key.is_a?(String) || key.is_a?(Symbol)
+          namespace_keys << record_or_hash_or_array.shift
         end
+
+        namespace_keys.map {|k| "#{k}_"}.join
       end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/record_identifier.rb b/vendor/rails/actionpack/lib/action_controller/record_identifier.rb
index 643ff7e5..742d290a 100644
--- a/vendor/rails/actionpack/lib/action_controller/record_identifier.rb
+++ b/vendor/rails/actionpack/lib/action_controller/record_identifier.rb
@@ -31,18 +31,21 @@ module ActionController
   module RecordIdentifier
     extend self
 
+    JOIN = '_'.freeze
+    NEW = 'new'.freeze
+
     # Returns plural/singular for a record or class. Example:
     #
     #   partial_path(post)                   # => "posts/post"
     #   partial_path(Person)                 # => "people/person"
     #   partial_path(Person, "admin/games")  # => "admin/people/person"
     def partial_path(record_or_class, controller_path = nil)
-      klass = class_from_record_or_class(record_or_class)
+      name = model_name_from_record_or_class(record_or_class)
 
       if controller_path && controller_path.include?("/")
-        "#{File.dirname(controller_path)}/#{klass.name.tableize}/#{klass.name.demodulize.underscore}"
+        "#{File.dirname(controller_path)}/#{name.partial_path}"
       else
-        "#{klass.name.tableize}/#{klass.name.demodulize.underscore}"
+        name.partial_path
       end
     end
 
@@ -56,21 +59,25 @@ module ActionController
     #   dom_class(post, :edit)   # => "edit_post"
     #   dom_class(Person, :edit) # => "edit_person"
     def dom_class(record_or_class, prefix = nil)
-      [ prefix, singular_class_name(record_or_class) ].compact * '_'
+      singular = singular_class_name(record_or_class)
+      prefix ? "#{prefix}#{JOIN}#{singular}" : singular
     end
 
     # The DOM id convention is to use the singular form of an object or class with the id following an underscore.
     # If no id is found, prefix with "new_" instead. Examples:
     #
-    #   dom_id(Post.new(:id => 45)) # => "post_45"
+    #   dom_id(Post.find(45))       # => "post_45"
     #   dom_id(Post.new)            # => "new_post"
     #
     # If you need to address multiple instances of the same class in the same view, you can prefix the dom_id:
     #
-    #   dom_id(Post.new(:id => 45), :edit) # => "edit_post_45"
+    #   dom_id(Post.find(45), :edit) # => "edit_post_45"
     def dom_id(record, prefix = nil) 
-      prefix ||= 'new' unless record.id
-      [ prefix, singular_class_name(record), record.id ].compact * '_'
+      if record_id = record.id
+        "#{dom_class(record, prefix)}#{JOIN}#{record_id}"
+      else
+        dom_class(record, prefix || NEW)
+      end
     end
 
     # Returns the plural class name of a record or class. Examples:
@@ -78,7 +85,7 @@ module ActionController
     #   plural_class_name(post)             # => "posts"
     #   plural_class_name(Highrise::Person) # => "highrise_people"
     def plural_class_name(record_or_class)
-      singular_class_name(record_or_class).pluralize
+      model_name_from_record_or_class(record_or_class).plural
     end
 
     # Returns the singular class name of a record or class. Examples:
@@ -86,12 +93,12 @@ module ActionController
     #   singular_class_name(post)             # => "post"
     #   singular_class_name(Highrise::Person) # => "highrise_person"
     def singular_class_name(record_or_class)
-      class_from_record_or_class(record_or_class).name.underscore.tr('/', '_')
+      model_name_from_record_or_class(record_or_class).singular
     end
 
     private
-      def class_from_record_or_class(record_or_class)
-        record_or_class.is_a?(Class) ? record_or_class : record_or_class.class
+      def model_name_from_record_or_class(record_or_class)
+        (record_or_class.is_a?(Class) ? record_or_class : record_or_class.class).model_name
       end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/request.rb b/vendor/rails/actionpack/lib/action_controller/request.rb
index a35b9041..ad1fe11d 100755
--- a/vendor/rails/actionpack/lib/action_controller/request.rb
+++ b/vendor/rails/actionpack/lib/action_controller/request.rb
@@ -134,14 +134,17 @@ module ActionController
     # REMOTE_ADDR is a proxy.  HTTP_X_FORWARDED_FOR may be a comma-
     # delimited list in the case of multiple chained proxies; the last
     # address which is not trusted is the originating IP.
-
     def remote_ip
-      if TRUSTED_PROXIES !~ @env['REMOTE_ADDR']
-        return @env['REMOTE_ADDR']
+      remote_addr_list = @env['REMOTE_ADDR'] && @env['REMOTE_ADDR'].split(',').collect(&:strip)
+
+      unless remote_addr_list.blank?
+        not_trusted_addrs = remote_addr_list.reject {|addr| addr =~ TRUSTED_PROXIES}
+        return not_trusted_addrs.first unless not_trusted_addrs.empty?
       end
+      remote_ips = @env['HTTP_X_FORWARDED_FOR'] && @env['HTTP_X_FORWARDED_FOR'].split(',')
 
       if @env.include? 'HTTP_CLIENT_IP'
-        if @env.include? 'HTTP_X_FORWARDED_FOR'
+        if remote_ips && !remote_ips.include?(@env['HTTP_CLIENT_IP'])
           # We don't know which came from the proxy, and which from the user
           raise ActionControllerError.new(<<EOM)
 IP spoofing attack?!
@@ -149,11 +152,11 @@ HTTP_CLIENT_IP=#{@env['HTTP_CLIENT_IP'].inspect}
 HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}
 EOM
         end
+
         return @env['HTTP_CLIENT_IP']
       end
 
-      if @env.include? 'HTTP_X_FORWARDED_FOR' then
-        remote_ips = @env['HTTP_X_FORWARDED_FOR'].split(',')
+      if remote_ips
         while remote_ips.size > 1 && TRUSTED_PROXIES =~ remote_ips.last.strip
           remote_ips.pop
         end
diff --git a/vendor/rails/actionpack/lib/action_controller/routing.rb b/vendor/rails/actionpack/lib/action_controller/routing.rb
index 6aa26651..dfbaa53b 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing.rb
@@ -88,6 +88,10 @@ module ActionController
   #
   #   map.connect ':controller/:action/:id', :action => 'show', :defaults => { :page => 'Dashboard' }
   #
+  # Note: The default routes, as provided by the Rails generator, make all actions in every
+  # controller accessible via GET requests. You should consider removing them or commenting
+  # them out if you're using named routes and resources.
+  #
   # == Named routes
   #
   # Routes can be named with the syntax <tt>map.name_of_route options</tt>,
@@ -369,7 +373,7 @@ module ActionController
 
     Routes = RouteSet.new
 
-    ::Inflector.module_eval do
+    ActiveSupport::Inflector.module_eval do
 	  # Ensures that routes are reloaded when Rails inflections are updated.
       def inflections_with_route_reloading(&block)
         returning(inflections_without_route_reloading(&block)) {
diff --git a/vendor/rails/actionpack/lib/action_controller/routing/builder.rb b/vendor/rails/actionpack/lib/action_controller/routing/builder.rb
index 4740113e..b8323847 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing/builder.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing/builder.rb
@@ -67,10 +67,9 @@ module ActionController
         options = options.dup
 
         if options[:namespace]
-          options[:controller] = "#{options[:path_prefix]}/#{options[:controller]}"
+          options[:controller] = "#{options.delete(:namespace).sub(/\/$/, '')}/#{options[:controller]}"
           options.delete(:path_prefix)
           options.delete(:name_prefix)
-          options.delete(:namespace)
         end
 
         requirements = (options.delete(:requirements) || {}).dup
diff --git a/vendor/rails/actionpack/lib/action_controller/routing/segments.rb b/vendor/rails/actionpack/lib/action_controller/routing/segments.rb
index e6729201..3afe2e89 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing/segments.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing/segments.rb
@@ -248,7 +248,7 @@ module ActionController
       end
 
       def extract_value
-        "#{local_name} = hash[:#{key}] && hash[:#{key}].collect { |path_component| CGI.escape(path_component.to_param, ActionController::Routing::Segment::UNSAFE_PCHAR) }.to_param #{"|| #{default.inspect}" if default}"
+        "#{local_name} = hash[:#{key}] && Array(hash[:#{key}]).collect { |path_component| CGI.escape(path_component.to_param, ActionController::Routing::Segment::UNSAFE_PCHAR) }.to_param #{"|| #{default.inspect}" if default}"
       end
 
       def default
diff --git a/vendor/rails/actionpack/lib/action_controller/templates/rescues/layout.erb b/vendor/rails/actionpack/lib/action_controller/templates/rescues/layout.erb
index d38f3e67..4a04742e 100644
--- a/vendor/rails/actionpack/lib/action_controller/templates/rescues/layout.erb
+++ b/vendor/rails/actionpack/lib/action_controller/templates/rescues/layout.erb
@@ -1,4 +1,4 @@
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>Action Controller: Exception caught</title>
   <style>
diff --git a/vendor/rails/actionpack/lib/action_controller/test_process.rb b/vendor/rails/actionpack/lib/action_controller/test_process.rb
index 0cf14321..503a9c0e 100644
--- a/vendor/rails/actionpack/lib/action_controller/test_process.rb
+++ b/vendor/rails/actionpack/lib/action_controller/test_process.rb
@@ -171,7 +171,7 @@ module ActionController #:nodoc:
 
     # Was the response successful?
     def success?
-      response_code == 200
+      (200..299).include?(response_code)
     end
 
     # Was the URL not found?
@@ -333,7 +333,7 @@ module ActionController #:nodoc:
     attr_reader :original_filename
 
     # The content type of the "uploaded" file
-    attr_reader :content_type
+    attr_accessor :content_type
 
     def initialize(path, content_type = Mime::TEXT, binary = false)
       raise "#{path} file does not exist" unless File.exist?(path)
@@ -413,6 +413,8 @@ module ActionController #:nodoc:
       get(@response.redirected_to.delete(:action), @response.redirected_to.stringify_keys)
     end
 
+    deprecate :follow_redirect => "If you wish to follow redirects, you should use integration tests"
+
     def assigns(key = nil) 
       if key.nil? 
         @response.template.assigns 
diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb b/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
index 607fd186..b8d73c35 100644
--- a/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
+++ b/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
@@ -17,7 +17,7 @@ module HTML #:nodoc:
       @root = Node.new(nil)
       node_stack = [ @root ]
       while token = tokenizer.next
-        node = Node.parse(node_stack.last, tokenizer.line, tokenizer.position, token)
+        node = Node.parse(node_stack.last, tokenizer.line, tokenizer.position, token, strict)
 
         node_stack.last.children << node unless node.tag? && node.closing == :close
         if node.tag?
diff --git a/vendor/rails/actionpack/lib/action_controller/verification.rb b/vendor/rails/actionpack/lib/action_controller/verification.rb
index 9f606e7b..35b12a7f 100644
--- a/vendor/rails/actionpack/lib/action_controller/verification.rb
+++ b/vendor/rails/actionpack/lib/action_controller/verification.rb
@@ -116,7 +116,7 @@ module ActionController #:nodoc:
     end
     
     def apply_redirect_to(redirect_to_option) # :nodoc:
-      redirect_to_option.is_a?(Symbol) ? self.send!(redirect_to_option) : redirect_to_option
+      (redirect_to_option.is_a?(Symbol) && redirect_to_option != :back) ? self.send!(redirect_to_option) : redirect_to_option
     end
     
     def apply_remaining_actions(options) # :nodoc:
diff --git a/vendor/rails/actionpack/lib/action_pack/version.rb b/vendor/rails/actionpack/lib/action_pack/version.rb
index c67654d9..5c022999 100644
--- a/vendor/rails/actionpack/lib/action_pack/version.rb
+++ b/vendor/rails/actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/actionpack/lib/action_view/base.rb b/vendor/rails/actionpack/lib/action_view/base.rb
index f3987565..b30b5652 100644
--- a/vendor/rails/actionpack/lib/action_view/base.rb
+++ b/vendor/rails/actionpack/lib/action_view/base.rb
@@ -178,10 +178,13 @@ module ActionView #:nodoc:
     # that alert()s the caught exception (and then re-raises it). 
     @@debug_rjs = false
     cattr_accessor :debug_rjs
-    
+
     @@erb_variable = '_erbout'
     cattr_accessor :erb_variable
-    
+    class << self
+      deprecate :erb_variable= => 'The erb variable will no longer be configurable. Use the concat helper method instead of appending to it directly.'
+    end
+
     attr_internal :request
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
@@ -253,6 +256,7 @@ If you are rendering a subtemplate, you must now use controller-like partial syn
       elsif options == :update
         update_page(&block)
       elsif options.is_a?(Hash)
+        use_full_path = options[:use_full_path]
         options = options.reverse_merge(:locals => {}, :use_full_path => true)
 
         if partial_layout = options.delete(:layout)
@@ -266,7 +270,7 @@ If you are rendering a subtemplate, you must now use controller-like partial syn
             end
           end
         elsif options[:file]
-          render_file(options[:file], options[:use_full_path], options[:locals])
+          render_file(options[:file], use_full_path || false, options[:locals])
         elsif options[:partial] && options[:collection]
           render_partial_collection(options[:partial], options[:collection], options[:spacer_template], options[:locals])
         elsif options[:partial]
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index e5a95a96..b86e1b7d 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -485,21 +485,24 @@ module ActionView
                     source = "#{@controller.request.relative_url_root}#{source}"
                   end
                 end
-                source = rewrite_asset_path(source)
 
-                if include_host
-                  host = compute_asset_host(source)
-
-                  if has_request && !host.blank? && host !~ %r{^[-a-z]+://}
-                    host = "#{@controller.request.protocol}#{host}"
-                  end
-
-                  "#{host}#{source}"
-                else
-                  source
-                end
+                rewrite_asset_path(source)
               end
             end
+
+          source = ActionView::Base.computed_public_paths[cache_key]
+
+          if include_host && source !~ %r{^[-a-z]+://}
+            host = compute_asset_host(source)
+
+            if has_request && !host.blank? && host !~ %r{^[-a-z]+://}
+              host = "#{@controller.request.protocol}#{host}"
+            end
+
+            "#{host}#{source}"
+          else
+            source
+          end
         end
 
         # Pick an asset host for this source. Returns +nil+ if no host is set,
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb
index 7ed62728..1aee9ef0 100755
--- a/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb
@@ -696,15 +696,15 @@ module ActionView
 
     class FormBuilder
       def date_select(method, options = {}, html_options = {})
-        @template.date_select(@object_name, method, options.merge(:object => @object))
+        @template.date_select(@object_name, method, options.merge(:object => @object), html_options)
       end
 
       def time_select(method, options = {}, html_options = {})
-        @template.time_select(@object_name, method, options.merge(:object => @object))
+        @template.time_select(@object_name, method, options.merge(:object => @object), html_options)
       end
 
       def datetime_select(method, options = {}, html_options = {})
-        @template.datetime_select(@object_name, method, options.merge(:object => @object))
+        @template.datetime_select(@object_name, method, options.merge(:object => @object), html_options)
       end
     end
   end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb
index 0791feb9..0d884de9 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb
@@ -601,7 +601,11 @@ module ActionView
       end
 
       def object
-        @object || (@template_object.instance_variable_get("@#{@object_name}") rescue nil)
+        @object || @template_object.instance_variable_get("@#{@object_name}")
+      rescue NameError
+        # As @object_name may contain the nested syntax (item[subobject]) we
+        # need to fallback to nil.
+        nil
       end
 
       def value(object)
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb
index e0a097e3..b3f8e63c 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -304,7 +304,7 @@ module ActionView
       #
       # NOTE: Only the option tags are returned, you have to wrap this call in
       # a regular HTML select tag.
-      def time_zone_options_for_select(selected = nil, priority_zones = nil, model = TimeZone)
+      def time_zone_options_for_select(selected = nil, priority_zones = nil, model = ::ActiveSupport::TimeZone)
         zone_options = ""
 
         zones = model.all
@@ -417,7 +417,7 @@ module ActionView
         value = value(object)
         content_tag("select",
           add_options(
-            time_zone_options_for_select(value || options[:default], priority_zones, options[:model] || TimeZone),
+            time_zone_options_for_select(value || options[:default], priority_zones, options[:model] || ActiveSupport::TimeZone),
             options, value
           ), html_options
         )
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb
index ca58f4ba..714d82a6 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -129,7 +129,7 @@ module ActionView
       #   label_tag 'name', nil, :class => 'small_label'
       #   # => <label for="name" class="small_label">Name</label>
       def label_tag(name, text = nil, options = {})
-        content_tag :label, text || name.humanize, { "for" => name }.update(options.stringify_keys)
+        content_tag :label, text || name.to_s.humanize, { "for" => name }.update(options.stringify_keys)
       end
 
       # Creates a hidden form input field used to transmit data that would be lost due to HTTP's statelessness or
@@ -348,11 +348,13 @@ module ActionView
         options.stringify_keys!
         
         if disable_with = options.delete("disable_with")
+          disable_with = "this.value='#{disable_with}'"
+          disable_with << ";#{options.delete('onclick')}" if options['onclick']
+          
           options["onclick"] = [
             "this.setAttribute('originalValue', this.value)",
             "this.disabled=true",
-            "this.value='#{disable_with}'",
-            "#{options["onclick"]}",
+            disable_with,
             "result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit())",
             "if (result == false) { this.value = this.getAttribute('originalValue'); this.disabled = false }",
             "return result;",
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/javascript_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/javascript_helper.rb
index 1ea3cbd7..9453c99c 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -80,10 +80,9 @@ module ActionView
       #       return false;">Show me more</a>
       #
       def link_to_function(name, *args, &block)
-        html_options = args.extract_options!
+        html_options = args.extract_options!.symbolize_keys
         function = args[0] || ''
 
-        html_options.symbolize_keys!
         function = update_page(&block) if block_given?
         content_tag(
           "a", name, 
@@ -111,10 +110,9 @@ module ActionView
       #     page[:details].visual_effect :toggle_slide
       #   end
       def button_to_function(name, *args, &block)
-        html_options = args.extract_options!
+        html_options = args.extract_options!.symbolize_keys
         function = args[0] || ''
 
-        html_options.symbolize_keys!
         function = update_page(&block) if block_given?
         tag(:input, html_options.merge({ 
           :type => "button", :value => name, 
@@ -147,6 +145,8 @@ module ActionView
         javascript << '</script>'
       end
 
+      deprecate :define_javascript_functions=>"use javascript_include_tag instead"
+
       # Escape carrier returns and single and double quotes for JavaScript segments.
       def escape_javascript(javascript)
         (javascript || '').gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb
index 602832e4..e8f79102 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -111,7 +111,7 @@ module ActionView
                          (100..599).to_a)
         AJAX_OPTIONS = Set.new([ :before, :after, :condition, :url,
                          :asynchronous, :method, :insertion, :position,
-                         :form, :with, :update, :script ]).merge(CALLBACKS)
+                         :form, :with, :update, :script, :type ]).merge(CALLBACKS)
       end
 
       # Returns a link to a remote action defined by <tt>options[:url]</tt> 
@@ -603,7 +603,7 @@ module ActionView
         # Example:
         #
         #   # Generates:
-        #   #     new Insertion.Bottom("list", "<li>Some item</li>");
+        #   #     new Element.insert("list", { bottom: <li>Some item</li>" });
         #   #     new Effect.Highlight("list");
         #   #     ["status-indicator", "cancel-link"].each(Element.hide);
         #   update_page do |page|
@@ -736,16 +736,16 @@ module ActionView
           #
           #   # Insert the rendered 'navigation' partial just before the DOM
           #   # element with ID 'content'.
-          #   # Generates: new Insertion.Before("content", "-- Contents of 'navigation' partial --");
+          #   # Generates: Element.insert("content", { before: "-- Contents of 'navigation' partial --" });
           #   page.insert_html :before, 'content', :partial => 'navigation'
           #
           #   # Add a list item to the bottom of the <ul> with ID 'list'.
-          #   # Generates: new Insertion.Bottom("list", "<li>Last item</li>");
+          #   # Generates: Element.insert("list", { bottom: "<li>Last item</li>" });
           #   page.insert_html :bottom, 'list', '<li>Last item</li>'
           #
           def insert_html(position, id, *options_for_render)
-            insertion = position.to_s.camelize
-            call "new Insertion.#{insertion}", id, render(*options_for_render)
+            content = javascript_object_for(render(*options_for_render))
+            record "Element.insert(\"#{id}\", { #{position.to_s.downcase}: #{content} });"
           end
           
           # Replaces the inner HTML of the DOM element with the given +id+.
@@ -1039,7 +1039,7 @@ module ActionView
       
         js_options['asynchronous'] = options[:type] != :synchronous
         js_options['method']       = method_option_to_s(options[:method]) if options[:method]
-        js_options['insertion']    = "Insertion.#{options[:position].to_s.camelize}" if options[:position]
+        js_options['insertion']    = "'#{options[:position].to_s.downcase}'" if options[:position]
         js_options['evalScripts']  = options[:script].nil? || options[:script]
 
         if options[:form]
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb
index 999cbfb5..ba43b5e8 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -1,5 +1,6 @@
 require 'cgi'
 require 'erb'
+require 'set'
 
 module ActionView
   module Helpers #:nodoc:
@@ -8,7 +9,8 @@ module ActionView
     module TagHelper
       include ERB::Util
 
-      BOOLEAN_ATTRIBUTES = Set.new(%w(disabled readonly multiple))
+      BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple).to_set
+      BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map(&:to_sym))
 
       # Returns an empty HTML tag of type +name+ which by default is XHTML 
       # compliant. Set +open+ to true to create an open tag compatible 
@@ -37,7 +39,7 @@ module ActionView
       #   tag("img", { :src => "open &amp; shut.png" }, false, false)
       #   # => <img src="open &amp; shut.png" />
       def tag(name, options = nil, open = false, escape = true)
-        "<#{name}#{tag_options(options, escape) if options}" + (open ? ">" : " />")
+        "<#{name}#{tag_options(options, escape) if options}#{open ? ">" : " />"}"
       end
 
       # Returns an HTML block tag of type +name+ surrounding the +content+. Add
@@ -114,7 +116,6 @@ module ActionView
             if escape
               options.each do |key, value|
                 next unless value
-                key = key.to_s
                 value = BOOLEAN_ATTRIBUTES.include?(key) ? key : escape_once(value)
                 attrs << %(#{key}="#{value}")
               end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb
index 669a2854..8ce98627 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb
@@ -464,7 +464,7 @@ module ActionView
                           [-\w]+                   # subdomain or domain
                           (?:\.[-\w]+)*            # remaining subdomains or domain
                           (?::\d+)?                # port
-                          (?:/(?:(?:[~\w\+@%=\(\)-]|(?:[,.;:][^\s$]))+)?)* # path
+                          (?:/(?:(?:[~\w\+@%=\(\)-]|(?:[,.;:'][^\s$]))+)?)* # path
                           (?:\?[\w\+@%&=.;-]+)?     # query string
                           (?:\#[\w\-]*)?           # trailing anchor
                         )
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb
index 4b12adf2..beb6b7ab 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb
@@ -63,17 +63,15 @@ module ActionView
       #   # calls @workshop.to_s
       #   # => /workshops/5
       def url_for(options = {})
+        options ||= {}
         case options
         when Hash
-          show_path =  options[:host].nil? ? true : false
-          options = { :only_path => show_path }.update(options.symbolize_keys)
+          options = { :only_path => options[:host].nil? }.update(options.symbolize_keys)
           escape  = options.key?(:escape) ? options.delete(:escape) : true
           url     = @controller.send(:url_for, options)
         when String
           escape = true
           url    = options
-        when NilClass
-          url = @controller.send(:url_for, nil)
         else
           escape = false
           url    = polymorphic_path(options)
@@ -444,7 +442,7 @@ module ActionView
         email_address_obfuscated.gsub!(/\./, html_options.delete("replace_dot")) if html_options.has_key?("replace_dot")
 
         if encode == "javascript"
-          "document.write('#{content_tag("a", name || email_address, html_options.merge({ "href" => "mailto:"+email_address+extras }))}');".each_byte do |c|
+          "document.write('#{content_tag("a", name || email_address_obfuscated, html_options.merge({ "href" => "mailto:"+email_address+extras }))}');".each_byte do |c|
             string << sprintf("%%%x", c)
           end
           "<script type=\"#{Mime::JS}\">eval(unescape('#{string}'))</script>"
diff --git a/vendor/rails/actionpack/lib/action_view/partial_template.rb b/vendor/rails/actionpack/lib/action_view/partial_template.rb
index 1fb3aaee..0b374db8 100644
--- a/vendor/rails/actionpack/lib/action_view/partial_template.rb
+++ b/vendor/rails/actionpack/lib/action_view/partial_template.rb
@@ -22,10 +22,10 @@ module ActionView #:nodoc:
     end
     
     def render_member(object)
-      @locals[@counter_name] += 1
       @locals[:object] = @locals[@variable_name] = object
       
       template = render_template
+      @locals[@counter_name] += 1
       @locals.delete(@variable_name)
       @locals.delete(:object)
       
diff --git a/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb b/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb
index f152b1d1..aac6eabc 100644
--- a/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb
@@ -137,6 +137,9 @@ class AssertResponseWithUnexpectedErrorController < ActionController::Base
   end
 end
 
+class UserController < ActionController::Base
+end
+
 module Admin
   class InnerModuleController < ActionController::Base
     def index
@@ -174,7 +177,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # let's get this party started
   def setup
     ActionController::Routing::Routes.reload
-    ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module content admin/user))
+    ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module user content admin/user))
     @controller = ActionPackAssertionsController.new
     @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
   end
@@ -268,7 +271,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
       assert_redirected_to admin_inner_module_path
     end
   end
-  
+
   def test_assert_redirected_to_top_level_named_route_from_nested_controller
     with_routing do |set|
       set.draw do |map|
@@ -277,11 +280,25 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
-      # passes -> assert_redirected_to "http://test.host/action_pack_assertions/foo"
+      # assert_redirected_to "http://test.host/action_pack_assertions/foo" would pass because of exact match early return
       assert_redirected_to "/action_pack_assertions/foo"
     end
   end
 
+  def test_assert_redirected_to_top_level_named_route_with_same_controller_name_in_both_namespaces
+    with_routing do |set|
+      set.draw do |map|
+        # this controller exists in the admin namespace as well which is the only difference from previous test
+        map.top_level '/user/:id', :controller => 'user', :action => 'index'
+        map.connect   ':controller/:action/:id'
+      end
+      @controller = Admin::InnerModuleController.new
+      process :redirect_to_top_level_named_route
+      # assert_redirected_to top_level_url('foo') would pass because of exact match early return
+      assert_redirected_to top_level_path('foo')
+    end
+  end
+
   # -- standard request/response object testing --------------------------------
 
   # make sure that the template objects exist
@@ -406,7 +423,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     process :redirect_to_action
     assert_redirected_to :action => "flash_me"
 
-    follow_redirect
+    assert_deprecated { follow_redirect }
     assert_equal 1, @request.parameters["id"].to_i
 
     assert "Inconceivable!", @response.body
@@ -416,7 +433,9 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     process :redirect_to_controller
     assert_redirected_to :controller => "elsewhere", :action => "flash_me"
 
-    assert_raises(RuntimeError, "Can't follow redirects outside of current controller (elsewhere)") { follow_redirect }
+    assert_raises(RuntimeError, "Can't follow redirects outside of current controller (elsewhere)") do
+      assert_deprecated { follow_redirect }
+    end
   end
 
   def test_assert_redirection_fails_with_incorrect_controller
diff --git a/vendor/rails/actionpack/test/controller/assert_select_test.rb b/vendor/rails/actionpack/test/controller/assert_select_test.rb
index 5af579f3..15b68431 100644
--- a/vendor/rails/actionpack/test/controller/assert_select_test.rb
+++ b/vendor/rails/actionpack/test/controller/assert_select_test.rb
@@ -568,7 +568,12 @@ class AssertSelectTest < Test::Unit::TestCase
       assert_select "div", 4
     end
   end
-  
+
+  def test_assert_select_rjs_raise_errors
+    assert_raises(ArgumentError) { assert_select_rjs(:destroy) }
+    assert_raises(ArgumentError) { assert_select_rjs(:insert, :left) }
+  end
+
   # Simple selection from a single result.
   def test_nested_assert_select_rjs_with_single_result
     render_rjs do |page|
diff --git a/vendor/rails/actionpack/test/controller/base_test.rb b/vendor/rails/actionpack/test/controller/base_test.rb
index b2871759..d49cc2a9 100644
--- a/vendor/rails/actionpack/test/controller/base_test.rb
+++ b/vendor/rails/actionpack/test/controller/base_test.rb
@@ -7,6 +7,7 @@ module Submodule
   end
   class ContainedNonEmptyController < ActionController::Base
     def public_action
+      render :nothing => true
     end
     
     hide_action :hidden_action
@@ -105,6 +106,18 @@ end
 
 
 class PerformActionTest < Test::Unit::TestCase
+  class MockLogger
+    attr_reader :logged
+
+    def initialize
+      @logged = []
+    end
+
+    def method_missing(method, *args)
+      @logged << args.first
+    end
+  end
+
   def use_controller(controller_class)
     @controller = controller_class.new
 
@@ -142,6 +155,13 @@ class PerformActionTest < Test::Unit::TestCase
     get :another_hidden_action
     assert_response 404
   end
+
+  def test_namespaced_action_should_log_module_name
+    use_controller Submodule::ContainedNonEmptyController
+    @controller.logger = MockLogger.new
+    get :public_action
+    assert_match /Processing\sSubmodule::ContainedNonEmptyController#public_action/, @controller.logger.logged[1]
+  end
 end
 
 class DefaultUrlOptionsTest < Test::Unit::TestCase
@@ -169,6 +189,22 @@ class DefaultUrlOptionsTest < Test::Unit::TestCase
   end
 end
 
+class EmptyUrlOptionsTest < Test::Unit::TestCase
+  def setup
+    @controller = NonEmptyController.new
+
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @request.host = 'www.example.com'
+  end
+
+  def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set
+    get :public_action
+    assert_equal "http://www.example.com/non_empty/public_action", @controller.url_for
+  end
+end
+
 class EnsureNamedRoutesWorksTicket22BugTest < Test::Unit::TestCase
   def test_named_routes_still_work
     ActionController::Routing::Routes.draw do |map|
@@ -180,4 +216,4 @@ class EnsureNamedRoutesWorksTicket22BugTest < Test::Unit::TestCase
   ensure
     ActionController::Routing::Routes.load!
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/actionpack/test/controller/dispatcher_test.rb b/vendor/rails/actionpack/test/controller/dispatcher_test.rb
index eea0813e..911fcab6 100644
--- a/vendor/rails/actionpack/test/controller/dispatcher_test.rb
+++ b/vendor/rails/actionpack/test/controller/dispatcher_test.rb
@@ -27,14 +27,14 @@ class DispatcherTest < Test::Unit::TestCase
 
   def test_clears_dependencies_after_dispatch_if_in_loading_mode
     ActionController::Routing::Routes.expects(:reload).once
-    Dependencies.expects(:clear).once
+    ActiveSupport::Dependencies.expects(:clear).once
 
     dispatch(@output, false)
   end
 
   def test_leaves_dependencies_after_dispatch_if_not_in_loading_mode
     ActionController::Routing::Routes.expects(:reload).never
-    Dependencies.expects(:clear).never
+    ActiveSupport::Dependencies.expects(:clear).never
 
     dispatch
   end
diff --git a/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb b/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb
index 0519533d..1c3facb9 100644
--- a/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb
+++ b/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb
@@ -120,4 +120,29 @@ HTML
     assert doc.find(:tag => "div", :attributes => { :id => "map" }, :content => "")
     assert doc.find(:tag => "div", :attributes => { :id => "map" }, :content => nil)
   end
+
+  def test_parse_invalid_document
+    assert_nothing_raised do
+      doc = HTML::Document.new("<html>
+        <table>
+          <tr>
+            <td style=\"color: #FFFFFF; height: 17px; onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" style=\"cursor:pointer; height: 17px;\"; nowrap onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" onmouseout=\"this.bgColor='#0066cc'; this.style.color='#FFFFFF'\" onmouseover=\"this.bgColor='#ffffff'; this.style.color='#0033cc'\">About Us</td>
+          </tr>
+        </table>
+      </html>")
+    end
+  end
+
+  def test_invalid_document_raises_exception_when_strict
+    assert_raises RuntimeError do
+      doc = HTML::Document.new("<html>
+        <table>
+          <tr>
+            <td style=\"color: #FFFFFF; height: 17px; onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" style=\"cursor:pointer; height: 17px;\"; nowrap onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" onmouseout=\"this.bgColor='#0066cc'; this.style.color='#FFFFFF'\" onmouseover=\"this.bgColor='#ffffff'; this.style.color='#0033cc'\">About Us</td>
+          </tr>
+        </table>
+      </html>", true)
+    end
+  end
+
 end
diff --git a/vendor/rails/actionpack/test/controller/integration_upload_test.rb b/vendor/rails/actionpack/test/controller/integration_upload_test.rb
index 33df1131..4af9b7e6 100644
--- a/vendor/rails/actionpack/test/controller/integration_upload_test.rb
+++ b/vendor/rails/actionpack/test/controller/integration_upload_test.rb
@@ -28,7 +28,7 @@ class SessionUploadTest < ActionController::IntegrationTest
   # end
   def test_post_with_upload
     uses_mocha "test_post_with_upload" do
-      Dependencies.stubs(:load?).returns(false)
+      ActiveSupport::Dependencies.stubs(:load?).returns(false)
       with_routing do |set|
         set.draw do |map|
           map.update 'update', :controller => "upload_test", :action => "update", :method => :post
diff --git a/vendor/rails/actionpack/test/controller/new_render_test.rb b/vendor/rails/actionpack/test/controller/new_render_test.rb
index 6e2c6d90..811066c6 100644
--- a/vendor/rails/actionpack/test/controller/new_render_test.rb
+++ b/vendor/rails/actionpack/test/controller/new_render_test.rb
@@ -68,6 +68,11 @@ class NewRenderTestController < ActionController::Base
     path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb')
     render :file => path
   end
+  
+  def render_file_from_template
+    @secret = 'in the sauce'
+    @path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb'))
+  end
 
   def render_file_with_locals
     path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.erb')
@@ -259,6 +264,10 @@ class NewRenderTestController < ActionController::Base
     render :template => "test/hello_world"
   end
 
+  def render_with_explicit_template_with_locals
+    render :template => "test/render_file_with_locals", :locals => { :secret => 'area51' }
+  end
+
   def double_render
     render :text => "hello"
     render :text => "world"
@@ -531,6 +540,11 @@ class NewRenderTest < Test::Unit::TestCase
     get :render_file_with_locals
     assert_equal "The secret is in the sauce\n", @response.body
   end
+  
+  def test_render_file_from_template
+    get :render_file_from_template
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
 
   def test_attempt_to_access_object_method
     assert_raises(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
@@ -742,7 +756,7 @@ EOS
   
   def test_partial_collection_with_counter
     get :partial_collection_with_counter
-    assert_equal "david1mary2", @response.body
+    assert_equal "david0mary1", @response.body
   end
   
   def test_partial_collection_with_locals
@@ -762,7 +776,7 @@ EOS
 
   def test_partial_collection_shorthand_with_different_types_of_records
     get :partial_collection_shorthand_with_different_types_of_records
-    assert_equal "Bonjour bad customer: mark1Bonjour good customer: craig2Bonjour bad customer: john3Bonjour good customer: zach4Bonjour good customer: brandon5Bonjour bad customer: dan6", @response.body
+    assert_equal "Bonjour bad customer: mark0Bonjour good customer: craig1Bonjour bad customer: john2Bonjour good customer: zach3Bonjour good customer: brandon4Bonjour bad customer: dan5", @response.body
   end
 
   def test_empty_partial_collection
@@ -800,7 +814,12 @@ EOS
     get :render_text_with_assigns
     assert_equal "world", assigns["hello"]
   end
-  
+
+  def test_template_with_locals
+    get :render_with_explicit_template_with_locals
+    assert_equal "The secret is area51\n", @response.body
+  end
+
   def test_update_page
     get :update_page
     assert_template nil
diff --git a/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb b/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb
index 4ec0d3cd..3f52526f 100644
--- a/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb
+++ b/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb
@@ -118,6 +118,39 @@ uses_mocha 'polymorphic URL helpers' do
       polymorphic_url([:site, :admin, @article, @response, @tag])
     end
 
+    def test_nesting_with_array_ending_in_singleton_resource
+      expects(:article_response_url).with(@article)
+      polymorphic_url([@article, :response])
+    end
+
+    def test_nesting_with_array_containing_singleton_resource
+      @tag = Tag.new
+      @tag.save
+      expects(:article_response_tag_url).with(@article, @tag)
+      polymorphic_url([@article, :response, @tag])
+    end
+
+    def test_nesting_with_array_containing_namespace_and_singleton_resource
+      @tag = Tag.new
+      @tag.save
+      expects(:admin_article_response_tag_url).with(@article, @tag)
+      polymorphic_url([:admin, @article, :response, @tag])
+    end
+
+    def test_nesting_with_array_containing_singleton_resource_and_format
+      @tag = Tag.new
+      @tag.save
+      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
+      formatted_polymorphic_url([@article, :response, @tag, :pdf])
+    end
+
+    def test_nesting_with_array_containing_singleton_resource_and_format_option
+      @tag = Tag.new
+      @tag.save
+      expects(:article_response_tag_url).with(@article, @tag, :pdf)
+      polymorphic_url([@article, :response, @tag], :format => :pdf)
+    end
+
     # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
     def xtest_with_hash
       expects(:article_url).with(@article)
diff --git a/vendor/rails/actionpack/test/controller/render_test.rb b/vendor/rails/actionpack/test/controller/render_test.rb
index 066fa6ac..9b492e6e 100644
--- a/vendor/rails/actionpack/test/controller/render_test.rb
+++ b/vendor/rails/actionpack/test/controller/render_test.rb
@@ -103,7 +103,7 @@ class TestController < ActionController::Base
   def render_line_offset
     begin
       render :inline => '<% raise %>', :locals => {:foo => 'bar'}
-    rescue => exc
+    rescue RuntimeError => exc
     end
     line = exc.backtrace.first
     render :text => line
diff --git a/vendor/rails/actionpack/test/controller/request_test.rb b/vendor/rails/actionpack/test/controller/request_test.rb
index 82ddfec8..32a04448 100644
--- a/vendor/rails/actionpack/test/controller/request_test.rb
+++ b/vendor/rails/actionpack/test/controller/request_test.rb
@@ -12,6 +12,9 @@ class RequestTest < Test::Unit::TestCase
     @request.remote_addr = '1.2.3.4'
     assert_equal '1.2.3.4', @request.remote_ip
 
+    @request.remote_addr = '1.2.3.4,3.4.5.6'
+    assert_equal '1.2.3.4', @request.remote_ip
+
     @request.env['HTTP_CLIENT_IP'] = '2.3.4.5'
     assert_equal '1.2.3.4', @request.remote_ip
 
@@ -59,6 +62,9 @@ class RequestTest < Test::Unit::TestCase
     assert_match /HTTP_X_FORWARDED_FOR="9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4"/, e.message
     assert_match /HTTP_CLIENT_IP="8.8.8.8"/, e.message
 
+    @request.env['HTTP_X_FORWARDED_FOR'] = '8.8.8.8, 9.9.9.9'
+    assert_equal '8.8.8.8', @request.remote_ip
+
     @request.env.delete 'HTTP_CLIENT_IP'
     @request.env.delete 'HTTP_X_FORWARDED_FOR'
   end
diff --git a/vendor/rails/actionpack/test/controller/resources_test.rb b/vendor/rails/actionpack/test/controller/resources_test.rb
index 0d089d0f..0f792464 100644
--- a/vendor/rails/actionpack/test/controller/resources_test.rb
+++ b/vendor/rails/actionpack/test/controller/resources_test.rb
@@ -28,18 +28,16 @@ module Backoffice
 end
 
 class ResourcesTest < Test::Unit::TestCase
-  
-  
   # The assertions in these tests are incompatible with the hash method
   # optimisation.  This could indicate user level problems
   def setup
     ActionController::Base.optimise_named_routes = false
   end
-  
-  def tear_down
+
+  def teardown
     ActionController::Base.optimise_named_routes = true
   end
-  
+
   def test_should_arrange_actions
     resource = ActionController::Resources::Resource.new(:messages,
       :collection => { :rss => :get, :reorder => :post, :csv => :post },
@@ -159,14 +157,14 @@ class ResourcesTest < Test::Unit::TestCase
 
   def test_with_collection_actions_and_name_prefix
     actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
-  
+
     with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions do
       assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.each do |action, method|
           assert_recognizes(options.merge(:action => action), :path => "/threads/1/messages/#{action}", :method => method)
         end
       end
-  
+
       assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.keys.each do |action|
           assert_named_route "/threads/1/messages/#{action}", "#{action}_thread_messages_path", :action => action
@@ -177,14 +175,14 @@ class ResourcesTest < Test::Unit::TestCase
 
   def test_with_collection_action_and_name_prefix_and_formatted
     actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
-  
+
     with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions do
       assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.each do |action, method|
           assert_recognizes(options.merge(:action => action, :format => 'xml'), :path => "/threads/1/messages/#{action}.xml", :method => method)
         end
       end
-  
+
       assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.keys.each do |action|
           assert_named_route "/threads/1/messages/#{action}.xml", "formatted_#{action}_thread_messages_path", :action => action, :format => 'xml'
@@ -279,7 +277,7 @@ class ResourcesTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_with_new_action_with_name_prefix
     with_restful_routing :messages, :new => { :preview => :post }, :path_prefix => '/threads/:thread_id', :name_prefix => 'thread_' do
       preview_options = {:action => 'preview', :thread_id => '1'}
@@ -293,7 +291,7 @@ class ResourcesTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_with_formatted_new_action_with_name_prefix
     with_restful_routing :messages, :new => { :preview => :post }, :path_prefix => '/threads/:thread_id', :name_prefix => 'thread_' do
       preview_options = {:action => 'preview', :thread_id => '1', :format => 'xml'}
@@ -307,7 +305,7 @@ class ResourcesTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_override_new_method
     with_restful_routing :messages do
       assert_restful_routes_for :messages do |options|
@@ -524,9 +522,9 @@ class ResourcesTest < Test::Unit::TestCase
         map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
         map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
       end
-      
+
       action_separator = ActionController::Base.resource_action_separator
-      
+
       assert_simply_restful_for :messages, :name_prefix => 'thread_', :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
       assert_named_route "/threads/1/messages#{action_separator}search", "search_thread_messages_path", {}
       assert_named_route "/threads/1/messages/new", "new_thread_message_path", {}
@@ -623,7 +621,7 @@ class ResourcesTest < Test::Unit::TestCase
       assert_simply_restful_for :products, :controller => "backoffice/products"
     end
   end
-  
+
   def test_nested_resources_using_namespace
     with_routing do |set|
       set.draw do |map|
@@ -795,7 +793,7 @@ class ResourcesTest < Test::Unit::TestCase
 
       yield options[:options] if block_given?
     end
-    
+
     def assert_singleton_routes_for(singleton_name, options = {})
       options[:options] ||= {}
       options[:options][:controller] = options[:controller] || singleton_name.to_s.pluralize
@@ -855,7 +853,7 @@ class ResourcesTest < Test::Unit::TestCase
       actual =  @controller.send(route, options) rescue $!.class.name
       assert_equal expected, actual, "Error on route: #{route}(#{options.inspect})"
     end
-    
+
     def assert_resource_methods(expected, resource, action_method, method)
       assert_equal expected.length, resource.send("#{action_method}_methods")[method].size, "#{resource.send("#{action_method}_methods")[method].inspect}"
       expected.each do |action|
diff --git a/vendor/rails/actionpack/test/controller/routing_test.rb b/vendor/rails/actionpack/test/controller/routing_test.rb
index 5e5503fd..b9af2b66 100644
--- a/vendor/rails/actionpack/test/controller/routing_test.rb
+++ b/vendor/rails/actionpack/test/controller/routing_test.rb
@@ -1983,6 +1983,26 @@ class RouteSetTest < Test::Unit::TestCase
     Object.send(:remove_const, :Api)
   end
 
+  def test_namespace_with_path_prefix
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+
+    set.draw do |map|
+
+      map.namespace 'api', :path_prefix => 'prefix' do |api|
+        api.route 'inventory', :controller => "products", :action => 'inventory'
+      end
+
+    end
+
+    request.path = "/prefix/inventory"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("inventory", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
+
   def test_generate_finds_best_fit
     set.draw do |map|
       map.connect "/people", :controller => "people", :action => "index"
@@ -2392,10 +2412,10 @@ uses_mocha 'route loading' do
     end
 
     def test_adding_inflections_forces_reload
-      Inflector::Inflections.instance.expects(:uncountable).with('equipment')
+      ActiveSupport::Inflector::Inflections.instance.expects(:uncountable).with('equipment')
       routes.expects(:reload!)
 
-      Inflector.inflections { |inflect| inflect.uncountable('equipment') }
+      ActiveSupport::Inflector.inflections { |inflect| inflect.uncountable('equipment') }
     end
     
     def test_load_with_configuration
diff --git a/vendor/rails/actionpack/test/controller/test_test.rb b/vendor/rails/actionpack/test/controller/test_test.rb
index 38898a1f..23aa30df 100644
--- a/vendor/rails/actionpack/test/controller/test_test.rb
+++ b/vendor/rails/actionpack/test/controller/test_test.rb
@@ -531,6 +531,11 @@ XML
     assert_equal content_type, file.content_type
     assert_equal file.path, file.local_path
     assert_equal expected, file.read
+
+    new_content_type = "new content_type"
+    file.content_type = new_content_type
+    assert_equal new_content_type, file.content_type
+
   end
   
   def test_test_uploaded_file_with_binary
@@ -571,7 +576,9 @@ XML
       get :redirect_to_same_controller
       assert_response :redirect
       assert_redirected_to :controller => 'test_test/test', :action => 'test_uri', :id => 5
-      assert_nothing_raised { follow_redirect }
+      assert_deprecated 'follow_redirect' do
+        assert_nothing_raised { follow_redirect }
+      end
     end
   end
 
@@ -580,7 +587,9 @@ XML
       get :redirect_to_different_controller
       assert_response :redirect
       assert_redirected_to :controller => 'fail', :id => 5
-      assert_raise(RuntimeError) { follow_redirect }
+      assert_raise(RuntimeError) do
+        assert_deprecated { follow_redirect }
+      end
     end
   end
 
diff --git a/vendor/rails/actionpack/test/controller/verification_test.rb b/vendor/rails/actionpack/test/controller/verification_test.rb
index d6fde35f..b2894431 100644
--- a/vendor/rails/actionpack/test/controller/verification_test.rb
+++ b/vendor/rails/actionpack/test/controller/verification_test.rb
@@ -21,10 +21,10 @@ class VerificationTest < Test::Unit::TestCase
 
     verify :only => :guarded_by_method, :method => :post,
            :redirect_to => { :action => "unguarded" }
-           
+
     verify :only => :guarded_by_xhr, :xhr => true,
            :redirect_to => { :action => "unguarded" }
-           
+
     verify :only => :guarded_by_not_xhr, :xhr => false,
            :redirect_to => { :action => "unguarded" }
 
@@ -39,10 +39,13 @@ class VerificationTest < Test::Unit::TestCase
 
     verify :only => :no_default_action, :params => "santa"
 
+    verify :only => :guarded_with_back, :method => :post,
+           :redirect_to => :back
+
     def guarded_one
       render :text => "#{params[:one]}"
     end
-    
+
     def guarded_one_for_named_route_test
       render :text => "#{params[:one]}"
     end
@@ -70,11 +73,11 @@ class VerificationTest < Test::Unit::TestCase
     def guarded_by_method
       render :text => "#{request.method}"
     end
-    
+
     def guarded_by_xhr
       render :text => "#{request.xhr?}"
     end
-    
+
     def guarded_by_not_xhr
       render :text => "#{request.xhr?}"
     end
@@ -86,15 +89,19 @@ class VerificationTest < Test::Unit::TestCase
     def two_redirects
       render :nothing => true
     end
-    
+
     def must_be_post
       render :text => "Was a post!"
     end
-    
+
+    def guarded_with_back
+      render :text => "#{params[:one]}"
+    end
+
     def no_default_action
       # Will never run
     end
-    
+
     protected
       def rescue_action(e) raise end
 
@@ -109,7 +116,17 @@ class VerificationTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
     ActionController::Routing::Routes.add_named_route :foo, '/foo', :controller => 'test', :action => 'foo'
   end
-  
+
+  def test_using_symbol_back_with_no_referrer
+    assert_raise(ActionController::RedirectBackError) { get :guarded_with_back }
+  end
+
+  def test_using_symbol_back_redirects_to_referrer
+    @request.env["HTTP_REFERER"] = "/foo"
+    get :guarded_with_back
+    assert_redirected_to '/foo'
+  end
+
   def test_no_deprecation_warning_for_named_route
     assert_not_deprecated do
       get :guarded_one_for_named_route_test, :two => "not one"
@@ -209,44 +226,44 @@ class VerificationTest < Test::Unit::TestCase
     get :guarded_by_method
     assert_redirected_to :action => "unguarded"
   end
-  
+
   def test_guarded_by_xhr_with_prereqs
     xhr :post, :guarded_by_xhr
     assert_equal "true", @response.body
   end
-    
+
   def test_guarded_by_xhr_without_prereqs
     get :guarded_by_xhr
     assert_redirected_to :action => "unguarded"
   end
-  
+
   def test_guarded_by_not_xhr_with_prereqs
     get :guarded_by_not_xhr
     assert_equal "false", @response.body
   end
-    
+
   def test_guarded_by_not_xhr_without_prereqs
     xhr :post, :guarded_by_not_xhr
     assert_redirected_to :action => "unguarded"
   end
-  
+
   def test_guarded_post_and_calls_render_succeeds
     post :must_be_post
     assert_equal "Was a post!", @response.body
   end
-    
+
   def test_default_failure_should_be_a_bad_request
     post :no_default_action
     assert_response :bad_request
   end
-    
+
   def test_guarded_post_and_calls_render_fails_and_sets_allow_header
     get :must_be_post
     assert_response 405
     assert_equal "Must be post", @response.body
     assert_equal "POST", @response.headers["Allow"]
   end
-  
+
   def test_second_redirect
     assert_nothing_raised { get :two_redirects }
   end
diff --git a/vendor/rails/actionpack/test/fixtures/test/render_file_from_template.html.erb b/vendor/rails/actionpack/test/fixtures/test/render_file_from_template.html.erb
new file mode 100644
index 00000000..fde9f4bb
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/render_file_from_template.html.erb
@@ -0,0 +1 @@
+<%= render :file => @path %>
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/template/date_helper_test.rb b/vendor/rails/actionpack/test/template/date_helper_test.rb
index 0a7b19ba..a435235a 100755
--- a/vendor/rails/actionpack/test/template/date_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/date_helper_test.rb
@@ -1157,6 +1157,32 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", {}, :class => 'selector')
   end
 
+  def test_date_select_with_html_options_within_fields_for
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    _erbout = ''
+
+    fields_for :post, @post do |f|
+      _erbout.concat f.date_select(:written_on, {}, :class => 'selector')
+    end
+
+    expected = %{<select id="post_written_on_1i" name="post[written_on(1i)]" class="selector">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]" class="selector">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_3i" name="post[written_on(3i)]" class="selector">\n}
+    expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+
+    expected << "</select>\n"
+
+    assert_dom_equal expected, _erbout
+  end
+
   def test_time_select
     @post = Post.new
     @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
@@ -1218,6 +1244,31 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, time_select("post", "written_on", {}, :class => 'selector')
   end
 
+  def test_time_select_with_html_options_within_fields_for
+    @post = Post.new
+    @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
+
+    _erbout = ''
+
+    fields_for :post, @post do |f|
+      _erbout.concat f.time_select(:written_on, {}, :class => 'selector')
+    end
+
+    expected = %{<input type="hidden" id="post_written_on_1i" name="post[written_on(1i)]" value="2004" />\n}
+    expected << %{<input type="hidden" id="post_written_on_2i" name="post[written_on(2i)]" value="6" />\n}
+    expected << %{<input type="hidden" id="post_written_on_3i" name="post[written_on(3i)]" value="15" />\n}
+
+    expected << %(<select id="post_written_on_4i" name="post[written_on(4i)]" class="selector">\n)
+    0.upto(23) { |i| expected << %(<option value="#{leading_zero_on_single_digits(i)}"#{' selected="selected"' if i == 15}>#{leading_zero_on_single_digits(i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %(<select id="post_written_on_5i" name="post[written_on(5i)]" class="selector">\n)
+    0.upto(59) { |i| expected << %(<option value="#{leading_zero_on_single_digits(i)}"#{' selected="selected"' if i == 16}>#{leading_zero_on_single_digits(i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, _erbout
+  end
+
   def test_datetime_select
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
@@ -1283,23 +1334,23 @@ class DateHelperTest < ActionView::TestCase
     end
   end
 
-  def test_datetime_select_within_fields_for
+  def test_datetime_select_with_html_options_within_fields_for
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
 
     _erbout = ''
 
     fields_for :post, @post do |f|
-      _erbout.concat f.datetime_select(:updated_at)
+      _erbout.concat f.datetime_select(:updated_at, {}, :class => 'selector')
     end
 
-    expected = "<select id='post_updated_at_1i' name='post[updated_at(1i)]'>\n<option value='1999'>1999</option>\n<option value='2000'>2000</option>\n<option value='2001'>2001</option>\n<option value='2002'>2002</option>\n<option value='2003'>2003</option>\n<option selected='selected' value='2004'>2004</option>\n<option value='2005'>2005</option>\n<option value='2006'>2006</option>\n<option value='2007'>2007</option>\n<option value='2008'>2008</option>\n<option value='2009'>2009</option>\n</select>\n"
-    expected << "<select id='post_updated_at_2i' name='post[updated_at(2i)]'>\n<option value='1'>January</option>\n<option value='2'>February</option>\n<option value='3'>March</option>\n<option value='4'>April</option>\n<option value='5'>May</option>\n<option selected='selected' value='6'>June</option>\n<option value='7'>July</option>\n<option value='8'>August</option>\n<option value='9'>September</option>\n<option value='10'>October</option>\n<option value='11'>November</option>\n<option value='12'>December</option>\n</select>\n"
-    expected << "<select id='post_updated_at_3i' name='post[updated_at(3i)]'>\n<option value='1'>1</option>\n<option value='2'>2</option>\n<option value='3'>3</option>\n<option value='4'>4</option>\n<option value='5'>5</option>\n<option value='6'>6</option>\n<option value='7'>7</option>\n<option value='8'>8</option>\n<option value='9'>9</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option selected='selected' value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n</select>\n"
-   expected << " &mdash; <select id='post_updated_at_4i' name='post[updated_at(4i)]'>\n<option value='00'>00</option>\n<option value='01'>01</option>\n<option value='02'>02</option>\n<option value='03'>03</option>\n<option value='04'>04</option>\n<option value='05'>05</option>\n<option value='06'>06</option>\n<option value='07'>07</option>\n<option value='08'>08</option>\n<option value='09'>09</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option value='15'>15</option>\n<option selected='selected' value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n</select>\n"
-  expected << " : <select id='post_updated_at_5i' name='post[updated_at(5i)]'>\n<option value='00'>00</option>\n<option value='01'>01</option>\n<option value='02'>02</option>\n<option value='03'>03</option>\n<option value='04'>04</option>\n<option value='05'>05</option>\n<option value='06'>06</option>\n<option value='07'>07</option>\n<option value='08'>08</option>\n<option value='09'>09</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n<option value='32'>32</option>\n<option value='33'>33</option>\n<option value='34'>34</option>\n<option selected='selected' value='35'>35</option>\n<option value='36'>36</option>\n<option value='37'>37</option>\n<option value='38'>38</option>\n<option value='39'>39</option>\n<option value='40'>40</option>\n<option value='41'>41</option>\n<option value='42'>42</option>\n<option value='43'>43</option>\n<option value='44'>44</option>\n<option value='45'>45</option>\n<option value='46'>46</option>\n<option value='47'>47</option>\n<option value='48'>48</option>\n<option value='49'>49</option>\n<option value='50'>50</option>\n<option value='51'>51</option>\n<option value='52'>52</option>\n<option value='53'>53</option>\n<option value='54'>54</option>\n<option value='55'>55</option>\n<option value='56'>56</option>\n<option value='57'>57</option>\n<option value='58'>58</option>\n<option value='59'>59</option>\n</select>\n"
+    expected = "<select id='post_updated_at_1i' name='post[updated_at(1i)]' class='selector'>\n<option value='1999'>1999</option>\n<option value='2000'>2000</option>\n<option value='2001'>2001</option>\n<option value='2002'>2002</option>\n<option value='2003'>2003</option>\n<option selected='selected' value='2004'>2004</option>\n<option value='2005'>2005</option>\n<option value='2006'>2006</option>\n<option value='2007'>2007</option>\n<option value='2008'>2008</option>\n<option value='2009'>2009</option>\n</select>\n"
+    expected << "<select id='post_updated_at_2i' name='post[updated_at(2i)]' class='selector'>\n<option value='1'>January</option>\n<option value='2'>February</option>\n<option value='3'>March</option>\n<option value='4'>April</option>\n<option value='5'>May</option>\n<option selected='selected' value='6'>June</option>\n<option value='7'>July</option>\n<option value='8'>August</option>\n<option value='9'>September</option>\n<option value='10'>October</option>\n<option value='11'>November</option>\n<option value='12'>December</option>\n</select>\n"
+    expected << "<select id='post_updated_at_3i' name='post[updated_at(3i)]' class='selector'>\n<option value='1'>1</option>\n<option value='2'>2</option>\n<option value='3'>3</option>\n<option value='4'>4</option>\n<option value='5'>5</option>\n<option value='6'>6</option>\n<option value='7'>7</option>\n<option value='8'>8</option>\n<option value='9'>9</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option selected='selected' value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n</select>\n"
+    expected << " &mdash; <select id='post_updated_at_4i' name='post[updated_at(4i)]' class='selector'>\n<option value='00'>00</option>\n<option value='01'>01</option>\n<option value='02'>02</option>\n<option value='03'>03</option>\n<option value='04'>04</option>\n<option value='05'>05</option>\n<option value='06'>06</option>\n<option value='07'>07</option>\n<option value='08'>08</option>\n<option value='09'>09</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option value='15'>15</option>\n<option selected='selected' value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n</select>\n"
+    expected << " : <select id='post_updated_at_5i' name='post[updated_at(5i)]' class='selector'>\n<option value='00'>00</option>\n<option value='01'>01</option>\n<option value='02'>02</option>\n<option value='03'>03</option>\n<option value='04'>04</option>\n<option value='05'>05</option>\n<option value='06'>06</option>\n<option value='07'>07</option>\n<option value='08'>08</option>\n<option value='09'>09</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n<option value='32'>32</option>\n<option value='33'>33</option>\n<option value='34'>34</option>\n<option selected='selected' value='35'>35</option>\n<option value='36'>36</option>\n<option value='37'>37</option>\n<option value='38'>38</option>\n<option value='39'>39</option>\n<option value='40'>40</option>\n<option value='41'>41</option>\n<option value='42'>42</option>\n<option value='43'>43</option>\n<option value='44'>44</option>\n<option value='45'>45</option>\n<option value='46'>46</option>\n<option value='47'>47</option>\n<option value='48'>48</option>\n<option value='49'>49</option>\n<option value='50'>50</option>\n<option value='51'>51</option>\n<option value='52'>52</option>\n<option value='53'>53</option>\n<option value='54'>54</option>\n<option value='55'>55</option>\n<option value='56'>56</option>\n<option value='57'>57</option>\n<option value='58'>58</option>\n<option value='59'>59</option>\n</select>\n"
 
-    assert_dom_equal(expected, _erbout)
+    assert_dom_equal expected, _erbout
   end
 
   def test_date_select_with_zero_value_and_no_start_year
diff --git a/vendor/rails/actionpack/test/template/deprecated_erb_variable_test.rb b/vendor/rails/actionpack/test/template/deprecated_erb_variable_test.rb
new file mode 100644
index 00000000..b07c5901
--- /dev/null
+++ b/vendor/rails/actionpack/test/template/deprecated_erb_variable_test.rb
@@ -0,0 +1,9 @@
+require 'abstract_unit'
+
+class DeprecatedErbVariableTest < ActionView::TestCase
+  def test_setting_erb_variable_warns
+    assert_deprecated 'erb_variable' do
+      ActionView::Base.erb_variable = '_erbout'
+    end
+  end
+end
diff --git a/vendor/rails/actionpack/test/template/form_options_helper_test.rb b/vendor/rails/actionpack/test/template/form_options_helper_test.rb
index 48a26dee..1a8c86b0 100644
--- a/vendor/rails/actionpack/test/template/form_options_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/form_options_helper_test.rb
@@ -1,66 +1,29 @@
 require 'abstract_unit'
 
-class MockTimeZone
-  attr_reader :name
+TZInfo::Timezone.cattr_reader :loaded_zones
 
-  def initialize( name )
-    @name = name
-  end
+uses_mocha "FormOptionsHelperTest" do
+  class FormOptionsHelperTest < ActionView::TestCase
+    tests ActionView::Helpers::FormOptionsHelper
 
-  def self.all
-    [ "A", "B", "C", "D", "E" ].map { |s| new s }
-  end
+    silence_warnings do
+      Post      = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
+      Continent = Struct.new('Continent', :continent_name, :countries)
+      Country   = Struct.new('Country', :country_id, :country_name)
+      Firm      = Struct.new('Firm', :time_zone)
+      Album     = Struct.new('Album', :id, :title, :genre)
+    end
 
-  def ==( z )
-    z && @name == z.name
-  end
+    def setup
+      @fake_timezones = %w(A B C D E).inject([]) do |zones, id|
+        tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id)
+        ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz)
+        zones << tz
+      end
+      ActiveSupport::TimeZone.stubs(:all).returns(@fake_timezones)
+    end
 
-  def to_s
-    @name
-  end
-end
-
-ActionView::Helpers::FormOptionsHelper::TimeZone = MockTimeZone
-
-class FormOptionsHelperTest < ActionView::TestCase
-  tests ActionView::Helpers::FormOptionsHelper
-
-  silence_warnings do
-    Post      = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
-    Continent = Struct.new('Continent', :continent_name, :countries)
-    Country   = Struct.new('Country', :country_id, :country_name)
-    Firm      = Struct.new('Firm', :time_zone)
-    Album     = Struct.new('Album', :id, :title, :genre)
-  end
-
-  def test_collection_options
-    @posts = [
-      Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-      Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-    ]
-
-    assert_dom_equal(
-      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
-      options_from_collection_for_select(@posts, "author_name", "title")
-    )
-  end
-
-
-  def test_collection_options_with_preselected_value
-    @posts = [
-      Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-      Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-    ]
-
-    assert_dom_equal(
-      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
-      options_from_collection_for_select(@posts, "author_name", "title", "Babe")
-    )
-  end
-
-  def test_collection_options_with_preselected_value_array
+    def test_collection_options
       @posts = [
         Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
         Post.new("Babe went home", "Babe", "To a little house", "shh!"),
@@ -68,358 +31,385 @@ class FormOptionsHelperTest < ActionView::TestCase
       ]
 
       assert_dom_equal(
-        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
-        options_from_collection_for_select(@posts, "author_name", "title", [ "Babe", "Cabe" ])
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+        options_from_collection_for_select(@posts, "author_name", "title")
       )
-  end
+    end
 
-  def test_array_options_for_select
-    assert_dom_equal(
-      "<option value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>",
-      options_for_select([ "<Denmark>", "USA", "Sweden" ])
-    )
-  end
 
-  def test_array_options_for_select_with_selection
-    assert_dom_equal(
-      "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
-      options_for_select([ "Denmark", "<USA>", "Sweden" ], "<USA>")
-    )
-  end
+    def test_collection_options_with_preselected_value
+      @posts = [
+        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
+      ]
 
-  def test_array_options_for_select_with_selection_array
       assert_dom_equal(
-        "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\" selected=\"selected\">Sweden</option>",
-        options_for_select([ "Denmark", "<USA>", "Sweden" ], [ "<USA>", "Sweden" ])
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+        options_from_collection_for_select(@posts, "author_name", "title", "Babe")
       )
-  end
+    end
 
-  def test_array_options_for_string_include_in_other_string_bug_fix
+    def test_collection_options_with_preselected_value_array
+        @posts = [
+          Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+          Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+          Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
+        ]
+
+        assert_dom_equal(
+          "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
+          options_from_collection_for_select(@posts, "author_name", "title", [ "Babe", "Cabe" ])
+        )
+    end
+
+    def test_array_options_for_select
       assert_dom_equal(
-        "<option value=\"ruby\">ruby</option>\n<option value=\"rubyonrails\" selected=\"selected\">rubyonrails</option>",
-        options_for_select([ "ruby", "rubyonrails" ], "rubyonrails")
+        "<option value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>",
+        options_for_select([ "<Denmark>", "USA", "Sweden" ])
+      )
+    end
+
+    def test_array_options_for_select_with_selection
+      assert_dom_equal(
+        "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
+        options_for_select([ "Denmark", "<USA>", "Sweden" ], "<USA>")
+      )
+    end
+
+    def test_array_options_for_select_with_selection_array
+        assert_dom_equal(
+          "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\" selected=\"selected\">Sweden</option>",
+          options_for_select([ "Denmark", "<USA>", "Sweden" ], [ "<USA>", "Sweden" ])
+        )
+    end
+
+    def test_array_options_for_string_include_in_other_string_bug_fix
+        assert_dom_equal(
+          "<option value=\"ruby\">ruby</option>\n<option value=\"rubyonrails\" selected=\"selected\">rubyonrails</option>",
+          options_for_select([ "ruby", "rubyonrails" ], "rubyonrails")
+        )
+        assert_dom_equal(
+          "<option value=\"ruby\" selected=\"selected\">ruby</option>\n<option value=\"rubyonrails\">rubyonrails</option>",
+          options_for_select([ "ruby", "rubyonrails" ], "ruby")
+        )
+        assert_dom_equal(
+          %(<option value="ruby" selected="selected">ruby</option>\n<option value="rubyonrails">rubyonrails</option>\n<option value=""></option>),
+          options_for_select([ "ruby", "rubyonrails", nil ], "ruby")
+        )
+    end
+
+    def test_hash_options_for_select
+      assert_dom_equal(
+        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
+        options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").sort.join("\n")
       )
       assert_dom_equal(
-        "<option value=\"ruby\" selected=\"selected\">ruby</option>\n<option value=\"rubyonrails\">rubyonrails</option>",
-        options_for_select([ "ruby", "rubyonrails" ], "ruby")
+        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+        options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").sort.join("\n")
       )
       assert_dom_equal(
-        %(<option value="ruby" selected="selected">ruby</option>\n<option value="rubyonrails">rubyonrails</option>\n<option value=""></option>),
-        options_for_select([ "ruby", "rubyonrails", nil ], "ruby")
+        "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+        options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").sort.join("\n")
       )
-  end
+    end
 
-  def test_hash_options_for_select
-    assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
-      options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").sort.join("\n")
-    )
-    assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").sort.join("\n")
-    )
-    assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").sort.join("\n")
-    )
-  end
+    def test_ducktyped_options_for_select
+      quack = Struct.new(:first, :last)
+      assert_dom_equal(
+        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
+        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")])
+      )
+      assert_dom_equal(
+        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], "Dollar")
+      )
+      assert_dom_equal(
+        "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], ["Dollar", "<Kroner>"])
+      )
+    end
 
-  def test_ducktyped_options_for_select
-    quack = Struct.new(:first, :last)
-    assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
-      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")])
-    )
-    assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], "Dollar")
-    )
-    assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], ["Dollar", "<Kroner>"])
-    )
-  end
+    def test_option_groups_from_collection_for_select
+      @continents = [
+        Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
+        Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
+      ]
 
-  def test_option_groups_from_collection_for_select
-    @continents = [
-      Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
-      Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
-    ]
+      assert_dom_equal(
+        "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option value=\"dk\" selected=\"selected\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>",
+        option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk")
+      )
+    end
 
-    assert_dom_equal(
-      "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option value=\"dk\" selected=\"selected\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>",
-      option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk")
-    )
-  end
+    def test_time_zone_options_no_parms
+      opts = time_zone_options_for_select
+      assert_dom_equal "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\">D</option>\n" +
+                  "<option value=\"E\">E</option>",
+                  opts
+    end
 
-  def test_time_zone_options_no_parms
-    opts = time_zone_options_for_select
-    assert_dom_equal "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\">D</option>\n" +
-                 "<option value=\"E\">E</option>",
-                 opts
-  end
+    def test_time_zone_options_with_selected
+      opts = time_zone_options_for_select( "D" )
+      assert_dom_equal "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                  "<option value=\"E\">E</option>",
+                  opts
+    end
 
-  def test_time_zone_options_with_selected
-    opts = time_zone_options_for_select( "D" )
-    assert_dom_equal "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                 "<option value=\"E\">E</option>",
-                 opts
-  end
+    def test_time_zone_options_with_unknown_selected
+      opts = time_zone_options_for_select( "K" )
+      assert_dom_equal "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\">D</option>\n" +
+                  "<option value=\"E\">E</option>",
+                  opts
+    end
 
-  def test_time_zone_options_with_unknown_selected
-    opts = time_zone_options_for_select( "K" )
-    assert_dom_equal "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\">D</option>\n" +
-                 "<option value=\"E\">E</option>",
-                 opts
-  end
+    def test_time_zone_options_with_priority_zones
+      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+      opts = time_zone_options_for_select( nil, zones )
+      assert_dom_equal "<option value=\"B\">B</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\">D</option>",
+                  opts
+    end
 
-  def test_time_zone_options_with_priority_zones
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
-    opts = time_zone_options_for_select( nil, zones )
-    assert_dom_equal "<option value=\"B\">B</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\">D</option>",
-                 opts
-  end
+    def test_time_zone_options_with_selected_priority_zones
+      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+      opts = time_zone_options_for_select( "E", zones )
+      assert_dom_equal "<option value=\"B\">B</option>\n" +
+                  "<option value=\"E\" selected=\"selected\">E</option>" +
+                  "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\">D</option>",
+                  opts
+    end
 
-  def test_time_zone_options_with_selected_priority_zones
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
-    opts = time_zone_options_for_select( "E", zones )
-    assert_dom_equal "<option value=\"B\">B</option>\n" +
-                 "<option value=\"E\" selected=\"selected\">E</option>" +
-                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\">D</option>",
-                 opts
-  end
+    def test_time_zone_options_with_unselected_priority_zones
+      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+      opts = time_zone_options_for_select( "C", zones )
+      assert_dom_equal "<option value=\"B\">B</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"C\" selected=\"selected\">C</option>\n" +
+                  "<option value=\"D\">D</option>",
+                  opts
+    end
 
-  def test_time_zone_options_with_unselected_priority_zones
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
-    opts = time_zone_options_for_select( "C", zones )
-    assert_dom_equal "<option value=\"B\">B</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"C\" selected=\"selected\">C</option>\n" +
-                 "<option value=\"D\">D</option>",
-                 opts
-  end
+    def test_select
+      @post = Post.new
+      @post.category = "<mus>"
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest))
+      )
+    end
 
-  def test_select
-    @post = Post.new
-    @post.category = "<mus>"
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest))
-    )
-  end
+    def test_select_under_fields_for
+      @post = Post.new
+      @post.category = "<mus>"
 
-  def test_select_under_fields_for
-    @post = Post.new
-    @post.category = "<mus>"
-    
-    _erbout = ''
-    
-    fields_for :post, @post do |f|
-      _erbout.concat f.select(:category, %w( abe <mus> hest))
+      _erbout = ''
+
+      fields_for :post, @post do |f|
+        _erbout.concat f.select(:category, %w( abe <mus> hest))
+      end
+
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        _erbout
+      )
+    end
+
+    def test_select_with_blank
+      @post = Post.new
+      @post.category = "<mus>"
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest), :include_blank => true)
+      )
+    end
+
+    def test_select_with_blank_as_string
+      @post = Post.new
+      @post.category = "<mus>"
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">None</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest), :include_blank => 'None')
+      )
+    end
+
+    def test_select_with_default_prompt
+      @post = Post.new
+      @post.category = ""
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest), :prompt => true)
+      )
+    end
+
+    def test_select_no_prompt_when_select_has_value
+      @post = Post.new
+      @post.category = "<mus>"
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest), :prompt => true)
+      )
+    end
+
+    def test_select_with_given_prompt
+      @post = Post.new
+      @post.category = ""
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">The prompt</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest), :prompt => 'The prompt')
+      )
+    end
+
+    def test_select_with_prompt_and_blank
+      @post = Post.new
+      @post.category = ""
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest), :prompt => true, :include_blank => true)
+      )
+    end
+
+    def test_select_with_selected_value
+      @post = Post.new
+      @post.category = "<mus>"
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" selected=\"selected\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest ), :selected => 'abe')
+      )
     end
     
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      _erbout
-    )
-  end
+    def test_select_with_index_option
+      @album = Album.new
+      @album.id = 1
 
-  def test_select_with_blank
-    @post = Post.new
-    @post.category = "<mus>"
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest), :include_blank => true)
-    )
-  end
+      expected = "<select id=\"album__genre\" name=\"album[][genre]\"><option value=\"rap\">rap</option>\n<option value=\"rock\">rock</option>\n<option value=\"country\">country</option></select>"
 
-  def test_select_with_blank_as_string
-    @post = Post.new
-    @post.category = "<mus>"
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">None</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest), :include_blank => 'None')
-    )
-  end
-
-  def test_select_with_default_prompt
-    @post = Post.new
-    @post.category = ""
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest), :prompt => true)
-    )
-  end
-
-  def test_select_no_prompt_when_select_has_value
-    @post = Post.new
-    @post.category = "<mus>"
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest), :prompt => true)
-    )
-  end
-
-  def test_select_with_given_prompt
-    @post = Post.new
-    @post.category = ""
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">The prompt</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest), :prompt => 'The prompt')
-    )
-  end
-
-  def test_select_with_prompt_and_blank
-    @post = Post.new
-    @post.category = ""
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest), :prompt => true, :include_blank => true)
-    )
-  end
-
-  def test_select_with_selected_value
-    @post = Post.new
-    @post.category = "<mus>"
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" selected=\"selected\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest ), :selected => 'abe')
-    )
-  end
-  
-  def test_select_with_index_option
-    @album = Album.new
-    @album.id = 1
-    
-    expected = "<select id=\"album__genre\" name=\"album[][genre]\"><option value=\"rap\">rap</option>\n<option value=\"rock\">rock</option>\n<option value=\"country\">country</option></select>"    
-
-    assert_dom_equal(
-      expected, 
-      select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
-    )
-  end
-
-  def test_select_with_selected_nil
-    @post = Post.new
-    @post.category = "<mus>"
-    assert_dom_equal(
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      select("post", "category", %w( abe <mus> hest ), :selected => nil)
-    )
-  end
-
-  def test_collection_select
-    @posts = [
-      Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-      Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-    ]
-
-    @post = Post.new
-    @post.author_name = "Babe"
-
-    assert_dom_equal(
-      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-      collection_select("post", "author_name", @posts, "author_name", "author_name")
-    )
-  end
-
-  def test_collection_select_under_fields_for
-    @posts = [
-      Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-      Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-    ]
-
-    @post = Post.new
-    @post.author_name = "Babe"
-    
-    _erbout = ''
-    
-    fields_for :post, @post do |f|
-      _erbout.concat f.collection_select(:author_name, @posts, :author_name, :author_name)
+      assert_dom_equal(
+        expected,
+        select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
+      )
     end
-    
-    assert_dom_equal(
-      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-      _erbout
-    )
-  end
 
-  def test_collection_select_with_blank_and_style
-    @posts = [
-      Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-      Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-    ]
+    def test_select_with_selected_nil
+      @post = Post.new
+      @post.category = "<mus>"
+      assert_dom_equal(
+        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+        select("post", "category", %w( abe <mus> hest ), :selected => nil)
+      )
+    end
 
-    @post = Post.new
-    @post.author_name = "Babe"
+    def test_collection_select
+      @posts = [
+        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
+      ]
 
-    assert_dom_equal(
-      "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-      collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px")
-    )
-  end
+      @post = Post.new
+      @post.author_name = "Babe"
 
-  def test_collection_select_with_blank_as_string_and_style
-    @posts = [
-      Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-      Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-    ]
+      assert_dom_equal(
+        "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+        collection_select("post", "author_name", @posts, "author_name", "author_name")
+      )
+    end
 
-    @post = Post.new
-    @post.author_name = "Babe"
+    def test_collection_select_under_fields_for
+      @posts = [
+        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
+      ]
 
-    assert_dom_equal(
-      "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\">No Selection</option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-      collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => 'No Selection' }, "style" => "width: 200px")
-    )
-  end
+      @post = Post.new
+      @post.author_name = "Babe"
 
-  def test_collection_select_with_multiple_option_appends_array_brackets
-    @posts = [
-      Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-      Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-    ]
+      _erbout = ''
 
-    @post = Post.new
-    @post.author_name = "Babe"
+      fields_for :post, @post do |f|
+        _erbout.concat f.collection_select(:author_name, @posts, :author_name, :author_name)
+      end
 
-    expected = "<select id=\"post_author_name\" name=\"post[author_name][]\" multiple=\"multiple\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>"
+      assert_dom_equal(
+        "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+        _erbout
+      )
+    end
 
-    # Should suffix default name with [].
-    assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, :multiple => true)
+    def test_collection_select_with_blank_and_style
+      @posts = [
+        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
+      ]
 
-    # Shouldn't suffix custom name with [].
-    assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true)
-  end
+      @post = Post.new
+      @post.author_name = "Babe"
 
-  def test_country_select
-    @post = Post.new
-    @post.origin = "Denmark"
-    expected_select = <<-COUNTRIES
+      assert_dom_equal(
+        "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+        collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px")
+      )
+    end
+
+    def test_collection_select_with_blank_as_string_and_style
+      @posts = [
+        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
+      ]
+
+      @post = Post.new
+      @post.author_name = "Babe"
+
+      assert_dom_equal(
+        "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\">No Selection</option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+        collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => 'No Selection' }, "style" => "width: 200px")
+      )
+    end
+
+    def test_collection_select_with_multiple_option_appends_array_brackets
+      @posts = [
+        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
+      ]
+
+      @post = Post.new
+      @post.author_name = "Babe"
+
+      expected = "<select id=\"post_author_name\" name=\"post[author_name][]\" multiple=\"multiple\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>"
+
+      # Should suffix default name with [].
+      assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, :multiple => true)
+
+      # Shouldn't suffix custom name with [].
+      assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true)
+    end
+
+    def test_country_select
+      @post = Post.new
+      @post.origin = "Denmark"
+      expected_select = <<-COUNTRIES
 <select id="post_origin" name="post[origin]"><option value="Afghanistan">Afghanistan</option>
 <option value="Aland Islands">Aland Islands</option>
 <option value="Albania">Albania</option>
@@ -665,14 +655,14 @@ class FormOptionsHelperTest < ActionView::TestCase
 <option value="Yemen">Yemen</option>
 <option value="Zambia">Zambia</option>
 <option value="Zimbabwe">Zimbabwe</option></select>
-COUNTRIES
-    assert_dom_equal(expected_select[0..-2], country_select("post", "origin"))
-  end
+  COUNTRIES
+      assert_dom_equal(expected_select[0..-2], country_select("post", "origin"))
+    end
 
-  def test_country_select_with_priority_countries
-    @post = Post.new
-    @post.origin = "Denmark"
-    expected_select = <<-COUNTRIES
+    def test_country_select_with_priority_countries
+      @post = Post.new
+      @post.origin = "Denmark"
+      expected_select = <<-COUNTRIES
 <select id="post_origin" name="post[origin]"><option value="New Zealand">New Zealand</option>
 <option value="Nicaragua">Nicaragua</option><option value="" disabled="disabled">-------------</option>
 <option value="Afghanistan">Afghanistan</option>
@@ -920,14 +910,14 @@ COUNTRIES
 <option value="Yemen">Yemen</option>
 <option value="Zambia">Zambia</option>
 <option value="Zimbabwe">Zimbabwe</option></select>
-COUNTRIES
-    assert_dom_equal(expected_select[0..-2], country_select("post", "origin", ["New Zealand", "Nicaragua"]))
-  end
+  COUNTRIES
+      assert_dom_equal(expected_select[0..-2], country_select("post", "origin", ["New Zealand", "Nicaragua"]))
+    end
 
-  def test_country_select_with_selected_priority_country
-    @post = Post.new
-    @post.origin = "New Zealand"
-    expected_select = <<-COUNTRIES
+    def test_country_select_with_selected_priority_country
+      @post = Post.new
+      @post.origin = "New Zealand"
+      expected_select = <<-COUNTRIES
 <select id="post_origin" name="post[origin]"><option selected="selected" value="New Zealand">New Zealand</option>
 <option value="Nicaragua">Nicaragua</option><option value="" disabled="disabled">-------------</option>
 <option value="Afghanistan">Afghanistan</option>
@@ -1175,162 +1165,163 @@ COUNTRIES
 <option value="Yemen">Yemen</option>
 <option value="Zambia">Zambia</option>
 <option value="Zimbabwe">Zimbabwe</option></select>
-COUNTRIES
-    assert_dom_equal(expected_select[0..-2], country_select("post", "origin", ["New Zealand", "Nicaragua"]))
-  end
-
-  def test_time_zone_select
-    @firm = Firm.new("D")
-    html = time_zone_select( "firm", "time_zone" )
-    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "</select>",
-                 html
-  end
-
-  def test_time_zone_select_under_fields_for
-    @firm = Firm.new("D")
-    
-    _erbout = ''
-    
-    fields_for :firm, @firm do |f|
-      _erbout.concat f.time_zone_select(:time_zone)
+  COUNTRIES
+      assert_dom_equal(expected_select[0..-2], country_select("post", "origin", ["New Zealand", "Nicaragua"]))
     end
-    
-    assert_dom_equal(
-      "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-      "<option value=\"A\">A</option>\n" +
-      "<option value=\"B\">B</option>\n" +
-      "<option value=\"C\">C</option>\n" +
-      "<option value=\"D\" selected=\"selected\">D</option>\n" +
-      "<option value=\"E\">E</option>" +
-      "</select>",
-      _erbout
-    )
-  end
 
-  def test_time_zone_select_with_blank
-    @firm = Firm.new("D")
-    html = time_zone_select("firm", "time_zone", nil, :include_blank => true)
-    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                 "<option value=\"\"></option>\n" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "</select>",
-                 html
-  end
-
-  def test_time_zone_select_with_blank_as_string
-    @firm = Firm.new("D")
-    html = time_zone_select("firm", "time_zone", nil, :include_blank => 'No Zone')
-    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                 "<option value=\"\">No Zone</option>\n" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "</select>",
-                 html
-  end
-
-  def test_time_zone_select_with_style
-    @firm = Firm.new("D")
-    html = time_zone_select("firm", "time_zone", nil, {},
-      "style" => "color: red")
-    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "</select>",
-                 html
-    assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {},
-      :style => "color: red")
-  end
-
-  def test_time_zone_select_with_blank_and_style
-    @firm = Firm.new("D")
-    html = time_zone_select("firm", "time_zone", nil,
-      { :include_blank => true }, "style" => "color: red")
-    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                 "<option value=\"\"></option>\n" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "</select>",
-                 html
-    assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
-      { :include_blank => true }, :style => "color: red")
-  end
-
-  def test_time_zone_select_with_blank_as_string_and_style
-    @firm = Firm.new("D")
-    html = time_zone_select("firm", "time_zone", nil,
-      { :include_blank => 'No Zone' }, "style" => "color: red")
-    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                 "<option value=\"\">No Zone</option>\n" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "</select>",
-                 html
-    assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
-      { :include_blank => 'No Zone' }, :style => "color: red")
-  end
-
-  def test_time_zone_select_with_priority_zones
-    @firm = Firm.new("D")
-    zones = [ TimeZone.new("A"), TimeZone.new("D") ]
-    html = time_zone_select("firm", "time_zone", zones )
-    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                 "<option value=\"A\">A</option>\n" +
-                 "<option value=\"D\" selected=\"selected\">D</option>" +
-                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                 "<option value=\"B\">B</option>\n" +
-                 "<option value=\"C\">C</option>\n" +
-                 "<option value=\"E\">E</option>" +
-                 "</select>",
-                 html
-  end
-
-  def test_time_zone_select_with_default_time_zone_and_nil_value
-     @firm = Firm.new()
-     @firm.time_zone = nil
-      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+    def test_time_zone_select
+      @firm = Firm.new("D")
+      html = time_zone_select( "firm", "time_zone" )
       assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\" selected=\"selected\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-  end
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "</select>",
+                  html
+    end
 
-  def test_time_zone_select_with_default_time_zone_and_value
-     @firm = Firm.new('D')
-      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+    def test_time_zone_select_under_fields_for
+      @firm = Firm.new("D")
+
+      _erbout = ''
+
+      fields_for :firm, @firm do |f|
+        _erbout.concat f.time_zone_select(:time_zone)
+      end
+
+      assert_dom_equal(
+        "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+        "<option value=\"A\">A</option>\n" +
+        "<option value=\"B\">B</option>\n" +
+        "<option value=\"C\">C</option>\n" +
+        "<option value=\"D\" selected=\"selected\">D</option>\n" +
+        "<option value=\"E\">E</option>" +
+        "</select>",
+        _erbout
+      )
+    end
+
+    def test_time_zone_select_with_blank
+      @firm = Firm.new("D")
+      html = time_zone_select("firm", "time_zone", nil, :include_blank => true)
       assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-  end
+                  "<option value=\"\"></option>\n" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "</select>",
+                  html
+    end
 
+    def test_time_zone_select_with_blank_as_string
+      @firm = Firm.new("D")
+      html = time_zone_select("firm", "time_zone", nil, :include_blank => 'No Zone')
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                  "<option value=\"\">No Zone</option>\n" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "</select>",
+                  html
+    end
+
+    def test_time_zone_select_with_style
+      @firm = Firm.new("D")
+      html = time_zone_select("firm", "time_zone", nil, {},
+        "style" => "color: red")
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "</select>",
+                  html
+      assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {},
+        :style => "color: red")
+    end
+
+    def test_time_zone_select_with_blank_and_style
+      @firm = Firm.new("D")
+      html = time_zone_select("firm", "time_zone", nil,
+        { :include_blank => true }, "style" => "color: red")
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                  "<option value=\"\"></option>\n" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "</select>",
+                  html
+      assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
+        { :include_blank => true }, :style => "color: red")
+    end
+
+    def test_time_zone_select_with_blank_as_string_and_style
+      @firm = Firm.new("D")
+      html = time_zone_select("firm", "time_zone", nil,
+        { :include_blank => 'No Zone' }, "style" => "color: red")
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                  "<option value=\"\">No Zone</option>\n" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "</select>",
+                  html
+      assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
+        { :include_blank => 'No Zone' }, :style => "color: red")
+    end
+
+    def test_time_zone_select_with_priority_zones
+      @firm = Firm.new("D")
+      zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ]
+      html = time_zone_select("firm", "time_zone", zones )
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                  "<option value=\"A\">A</option>\n" +
+                  "<option value=\"D\" selected=\"selected\">D</option>" +
+                  "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                  "<option value=\"B\">B</option>\n" +
+                  "<option value=\"C\">C</option>\n" +
+                  "<option value=\"E\">E</option>" +
+                  "</select>",
+                  html
+    end
+
+    def test_time_zone_select_with_default_time_zone_and_nil_value
+      @firm = Firm.new()
+      @firm.time_zone = nil
+        html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+        assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                    "<option value=\"A\">A</option>\n" +
+                    "<option value=\"B\" selected=\"selected\">B</option>\n" +
+                    "<option value=\"C\">C</option>\n" +
+                    "<option value=\"D\">D</option>\n" +
+                    "<option value=\"E\">E</option>" +
+                    "</select>",
+                    html
+    end
+
+    def test_time_zone_select_with_default_time_zone_and_value
+      @firm = Firm.new('D')
+        html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+        assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                    "<option value=\"A\">A</option>\n" +
+                    "<option value=\"B\">B</option>\n" +
+                    "<option value=\"C\">C</option>\n" +
+                    "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                    "<option value=\"E\">E</option>" +
+                    "</select>",
+                    html
+    end
+
+  end
 end
diff --git a/vendor/rails/actionpack/test/template/form_tag_helper_test.rb b/vendor/rails/actionpack/test/template/form_tag_helper_test.rb
index 73a8bd4d..5bdbde3a 100644
--- a/vendor/rails/actionpack/test/template/form_tag_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/form_tag_helper_test.rb
@@ -190,6 +190,12 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_label_tag_with_symbol
+    actual = label_tag :title
+    expected = %(<label for="title">Title</label>)
+    assert_dom_equal expected, actual
+  end
+
   def test_label_tag_with_text
     actual = label_tag "title", "My Title"
     expected = %(<label for="title">My Title</label>)
@@ -222,6 +228,13 @@ class FormTagHelperTest < ActionView::TestCase
     )
   end
 
+  def test_submit_tag_with_no_onclick_options
+    assert_dom_equal(
+      %(<input name='commit' type='submit' value='Save' onclick="this.setAttribute('originalValue', this.value);this.disabled=true;this.value='Saving...';result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue'); this.disabled = false };return result;" />),
+      submit_tag("Save", :disable_with => "Saving...")
+    )
+  end
+
   def test_submit_tag_with_confirmation
     assert_dom_equal(
       %(<input name='commit' type='submit' value='Save' onclick="return confirm('Are you sure?');"/>),
diff --git a/vendor/rails/actionpack/test/template/javascript_helper_test.rb b/vendor/rails/actionpack/test/template/javascript_helper_test.rb
index f18adb99..0003bdd0 100644
--- a/vendor/rails/actionpack/test/template/javascript_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/javascript_helper_test.rb
@@ -4,11 +4,14 @@ class JavaScriptHelperTest < ActionView::TestCase
   tests ActionView::Helpers::JavaScriptHelper
 
   def test_define_javascript_functions
-    # check if prototype.js is included first
-    assert_not_nil define_javascript_functions.split("\n")[1].match(/Prototype JavaScript framework/)
+    assert_deprecated(/javascript_include_tag/) do
+      # check if prototype.js is included first
+      src = define_javascript_functions
+      assert_not_nil src.split("\n")[1].match(/Prototype JavaScript framework/)
 
-    # check that scriptaculous.js is not in here, only needed if loaded remotely
-    assert_nil define_javascript_functions.split("\n")[1].match(/var Scriptaculous = \{/)
+      # check that scriptaculous.js is not in here, only needed if loaded remotely
+      assert_nil src.split("\n")[1].match(/var Scriptaculous = \{/)
+    end
   end
 
   def test_escape_javascript
diff --git a/vendor/rails/actionpack/test/template/prototype_helper_test.rb b/vendor/rails/actionpack/test/template/prototype_helper_test.rb
index 53a250f9..586be5b5 100644
--- a/vendor/rails/actionpack/test/template/prototype_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/prototype_helper_test.rb
@@ -77,6 +77,10 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
       link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot"  })
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot?a=10&amp;b=20', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot", :a => '10', :b => '20' })
+    assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:false, evalScripts:true}); return false;\">Remote outauthor</a>),
+      link_to_remote("Remote outauthor", :url => { :action => "whatnot" }, :type => :synchronous)
+    assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, insertion:'bottom'}); return false;\">Remote outauthor</a>),
+      link_to_remote("Remote outauthor", :url => { :action => "whatnot" }, :position => :bottom)
   end
   
   def test_link_to_remote_html_options
@@ -288,13 +292,13 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
   end
   
   def test_insert_html_with_string
-    assert_equal 'new Insertion.Top("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");',
+    assert_equal 'Element.insert("element", { top: "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E" });',
       @generator.insert_html(:top, 'element', '<p>This is a test</p>')
-    assert_equal 'new Insertion.Bottom("element", "\\u003Cp\u003EThis is a test\\u003C/p\u003E");',
+    assert_equal 'Element.insert("element", { bottom: "\\u003Cp\u003EThis is a test\\u003C/p\u003E" });',
       @generator.insert_html(:bottom, 'element', '<p>This is a test</p>')
-    assert_equal 'new Insertion.Before("element", "\\u003Cp\u003EThis is a test\\u003C/p\u003E");',
+    assert_equal 'Element.insert("element", { before: "\\u003Cp\u003EThis is a test\\u003C/p\u003E" });',
       @generator.insert_html(:before, 'element', '<p>This is a test</p>')
-    assert_equal 'new Insertion.After("element", "\\u003Cp\u003EThis is a test\\u003C/p\u003E");',
+    assert_equal 'Element.insert("element", { after: "\\u003Cp\u003EThis is a test\\u003C/p\u003E" });',
       @generator.insert_html(:after, 'element', '<p>This is a test</p>')
   end
   
@@ -362,8 +366,8 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     @generator.replace_html('baz', '<p>This is a test</p>')
     
     assert_equal <<-EOS.chomp, @generator.to_s
-new Insertion.Top("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
-new Insertion.Bottom("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
+Element.insert("element", { top: "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E" });
+Element.insert("element", { bottom: "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E" });
 ["foo", "bar"].each(Element.remove);
 Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     EOS
@@ -425,6 +429,8 @@ Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
   def test_sortable
     assert_equal %(Sortable.create("blah", {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("blah")})}});), 
       @generator.sortable('blah', :url => { :action => "order" })
+    assert_equal %(Sortable.create("blah", {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:false, evalScripts:true, parameters:Sortable.serialize("blah")})}});),
+      @generator.sortable('blah', :url => { :action => "order" }, :type => :synchronous)
   end
   
   def test_draggable
@@ -435,6 +441,8 @@ Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
   def test_drop_receiving
     assert_equal %(Droppables.add("blah", {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});), 
       @generator.drop_receiving('blah', :url => { :action => "order" })
+    assert_equal %(Droppables.add("blah", {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:false, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});),
+      @generator.drop_receiving('blah', :url => { :action => "order" }, :type => :synchronous)
   end
 
   def test_collection_first_and_last
diff --git a/vendor/rails/actionpack/test/template/text_helper_test.rb b/vendor/rails/actionpack/test/template/text_helper_test.rb
index 62cdca03..52aa3bef 100644
--- a/vendor/rails/actionpack/test/template/text_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/text_helper_test.rb
@@ -187,6 +187,7 @@ class TextHelperTest < ActionView::TestCase
               http://www.mail-archive.com/rails@lists.rubyonrails.org/
               http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
               http://en.wikipedia.org/wiki/Sprite_(computer_graphics)
+              http://en.wikipedia.org/wiki/Texas_hold'em
             )
 
     urls.each do |url|
diff --git a/vendor/rails/actionpack/test/template/url_helper_test.rb b/vendor/rails/actionpack/test/template/url_helper_test.rb
index d45ea08a..9c4a09b8 100644
--- a/vendor/rails/actionpack/test/template/url_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/url_helper_test.rb
@@ -284,6 +284,7 @@ class UrlHelperTest < ActionView::TestCase
     assert_dom_equal "<a href=\"&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">My email</a>", mail_to("me@domain.com", "My email", :encode => "hex", :replace_at => "(at)")
     assert_dom_equal "<a href=\"&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">&#109;&#101;&#40;&#97;&#116;&#41;&#100;&#111;&#109;&#97;&#105;&#110;&#40;&#100;&#111;&#116;&#41;&#99;&#111;&#109;</a>", mail_to("me@domain.com", nil, :encode => "hex", :replace_at => "(at)", :replace_dot => "(dot)")
     assert_dom_equal "<script type=\"text/javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
+    assert_dom_equal "<script type=\"text/javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%6d%65%28%61%74%29%64%6f%6d%61%69%6e%28%64%6f%74%29%63%6f%6d%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", nil, :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
   end
   
   def protect_against_forgery?
@@ -305,6 +306,10 @@ class UrlHelperWithControllerTest < ActionView::TestCase
       render :inline => "<%= show_named_route_#{params[:kind]} %>"
     end
 
+    def nil_url_for
+      render :inline => '<%= url_for(nil) %>'
+    end
+
     def rescue_action(e) raise e end
   end
 
@@ -321,7 +326,7 @@ class UrlHelperWithControllerTest < ActionView::TestCase
     assert_equal '/url_helper_with_controller/show_url_for', @response.body
   end
 
-  def test_named_route_shows_host_and_path
+  def test_named_route_url_shows_host_and_path
     with_url_helper_routing do
       get :show_named_route, :kind => 'url'
       assert_equal 'http://test.host/url_helper_with_controller/show_named_route', @response.body
@@ -335,6 +340,11 @@ class UrlHelperWithControllerTest < ActionView::TestCase
     end
   end
 
+  def test_url_for_nil_returns_current_path
+    get :nil_url_for
+    assert_equal '/url_helper_with_controller/nil_url_for', @response.body
+  end
+
   protected
     def with_url_helper_routing
       with_routing do |set|
diff --git a/vendor/rails/activemodel/Rakefile b/vendor/rails/activemodel/Rakefile
index 87e9b547..99c9fc3b 100644
--- a/vendor/rails/activemodel/Rakefile
+++ b/vendor/rails/activemodel/Rakefile
@@ -10,7 +10,7 @@ Rake::RDocTask.new { |rdoc|
   rdoc.title    = "Active Model"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
   rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
   rdoc.rdoc_files.include('README', 'CHANGES')
   rdoc.rdoc_files.include('lib/**/*.rb')
-}
\ No newline at end of file
+}
diff --git a/vendor/rails/activerecord/CHANGELOG b/vendor/rails/activerecord/CHANGELOG
index 1c7c9771..a0bdf92a 100644
--- a/vendor/rails/activerecord/CHANGELOG
+++ b/vendor/rails/activerecord/CHANGELOG
@@ -1,3 +1,37 @@
+*2.1.1 (September 4th, 2008)*
+
+* Set config.active_record.timestamped_migrations = false to have migrations with numeric prefix instead of UTC timestamp. #446. [Andrew Stone, Nik Wakelin]
+
+* Fixed that create database statements would always include "DEFAULT NULL" (Nick Sieger) [#334]
+
+* change_column_default preserves the not-null constraint.  #617 [Tarmo Tänav]
+
+* Add :tokenizer option to validates_length_of to specify how to split up the attribute string. #507. [David Lowenfels] Example :
+
+  # Ensure essay contains at least 100 words.
+  validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least %d words."), :tokenizer => lambda {|str| str.scan(/\w+/) }
+
+* Always treat integer :limit as byte length.  #420 [Tarmo Tänav]
+
+* Partial updates don't update lock_version if nothing changed.  #426 [Daniel Morrison]
+
+* Fix column collision with named_scope and :joins.  #46 [Duncan Beevers, Mark Catley]
+
+* db:migrate:down and :up update schema_migrations.  #369 [Michael Raidel, RaceCondition]
+
+* PostgreSQL: support :conditions => [':foo::integer', { :foo => 1 }] without treating the ::integer typecast as a bind variable.  [Tarmo Tänav]
+
+* MySQL: rename_column preserves column defaults.  #466 [Diego Algorta]
+
+* Add :from option to calculations.  #397 [Ben Munat]
+
+* Add :validate option to associations to enable/disable the automatic validation of associated models. Resolves #301. [Jan De Poorter]
+
+* PostgreSQL: use 'INSERT ... RETURNING id' for 8.2 and later.  [Jeremy Kemper]
+
+* Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess]
+
+
 *2.1.0 (May 31st, 2008)*
 
 * Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick]
diff --git a/vendor/rails/activerecord/Rakefile b/vendor/rails/activerecord/Rakefile
index fc068b16..506af634 100755
--- a/vendor/rails/activerecord/Rakefile
+++ b/vendor/rails/activerecord/Rakefile
@@ -5,6 +5,7 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
+require 'rake/contrib/rubyforgepublisher'
 
 require File.join(File.dirname(__FILE__), 'lib', 'active_record', 'version')
 require File.expand_path(File.dirname(__FILE__)) + "/test/config"
@@ -141,7 +142,7 @@ Rake::RDocTask.new { |rdoc|
   rdoc.title    = "Active Record -- Object-relation mapping put on rails"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
   rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
   rdoc.rdoc_files.include('README', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.exclude('lib/active_record/vendor/*')
@@ -171,7 +172,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
 
-  s.add_dependency('activesupport', '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.1.1' + PKG_BUILD)
 
   s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite"
   s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite"
@@ -225,13 +226,13 @@ end
 
 desc "Publish the beta gem"
 task :pgem => [:package] do
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
+  Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do
-  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/ar", "doc").upload
+  Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ar", "doc").upload
 end
 
 desc "Publish the release files to RubyForge."
diff --git a/vendor/rails/activerecord/lib/active_record.rb b/vendor/rails/activerecord/lib/active_record.rb
index d4f71703..0121f717 100755
--- a/vendor/rails/activerecord/lib/active_record.rb
+++ b/vendor/rails/activerecord/lib/active_record.rb
@@ -24,16 +24,14 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-unless defined? ActiveSupport
-  active_support_path = File.dirname(__FILE__) + "/../../activesupport/lib"
-  if File.exist?(active_support_path)
-    $:.unshift active_support_path
-    require 'active_support'
-  else
-    require 'rubygems'
-    gem 'activesupport'
-    require 'active_support'
-  end
+active_support_path = File.dirname(__FILE__) + "/../../activesupport/lib"
+if File.exist?(active_support_path)
+  $:.unshift active_support_path
+  require 'active_support'
+else
+  require 'rubygems'
+  gem 'activesupport'
+  require 'active_support'
 end
 
 require 'active_record/base'
diff --git a/vendor/rails/activerecord/lib/active_record/association_preload.rb b/vendor/rails/activerecord/lib/active_record/association_preload.rb
index a3d1f12b..74b4a113 100644
--- a/vendor/rails/activerecord/lib/active_record/association_preload.rb
+++ b/vendor/rails/activerecord/lib/active_record/association_preload.rb
@@ -51,9 +51,7 @@ module ActiveRecord
       
       def add_preloaded_record_to_collection(parent_records, reflection_name, associated_record)
         parent_records.each do |parent_record|
-          association_proxy = parent_record.send(reflection_name)
-          association_proxy.loaded
-          association_proxy.target = associated_record
+          parent_record.send("set_#{reflection_name}_target", associated_record)
         end
       end
 
@@ -103,17 +101,17 @@ module ActiveRecord
         associated_records = reflection.klass.find(:all, :conditions => [conditions, ids],
         :include => options[:include],
         :joins => "INNER JOIN #{connection.quote_table_name options[:join_table]} as t0 ON #{reflection.klass.quoted_table_name}.#{reflection.klass.primary_key} = t0.#{reflection.association_foreign_key}",
-        :select => "#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as _parent_record_id",
+        :select => "#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as the_parent_record_id",
         :order => options[:order])
 
-        set_association_collection_records(id_to_record_map, reflection.name, associated_records, '_parent_record_id')
+        set_association_collection_records(id_to_record_map, reflection.name, associated_records, 'the_parent_record_id')
       end
 
       def preload_has_one_association(records, reflection, preload_options={})
         id_to_record_map, ids = construct_id_map(records)        
         options = reflection.options
+        records.each {|record| record.send("set_#{reflection.name}_target", nil)}
         if options[:through]
-          records.each {|record| record.send(reflection.name) && record.send(reflection.name).loaded}
           through_records = preload_through_records(records, reflection, options[:through])
           through_reflection = reflections[options[:through]]
           through_primary_key = through_reflection.primary_key_name
@@ -126,8 +124,6 @@ module ActiveRecord
             end
           end
         else
-          records.each {|record| record.send("set_#{reflection.name}_target", nil)}
-
           set_association_single_records(id_to_record_map, reflection.name, find_associated_records(ids, reflection, preload_options), reflection.primary_key_name)
         end
       end
@@ -188,7 +184,6 @@ module ActiveRecord
         through_records
       end
 
-      # FIXME: quoting
       def preload_belongs_to_association(records, reflection, preload_options={})
         options = reflection.options
         primary_key_name = reflection.primary_key_name
@@ -227,9 +222,19 @@ module ActiveRecord
 
           table_name = klass.quoted_table_name
           primary_key = klass.primary_key
-          conditions = "#{table_name}.#{primary_key} IN (?)"
+          conditions = "#{table_name}.#{connection.quote_column_name(primary_key)} IN (?)"
           conditions << append_conditions(options, preload_options)
-          associated_records = klass.find(:all, :conditions => [conditions, id_map.keys.uniq],
+          column_type = klass.columns.detect{|c| c.name == primary_key}.type
+          ids = id_map.keys.uniq.map do |id|
+            if column_type == :integer
+              id.to_i
+            elsif column_type == :float
+              id.to_f
+            else
+              id
+            end
+          end
+          associated_records = klass.find(:all, :conditions => [conditions, ids],
                                           :include => options[:include],
                                           :select => options[:select],
                                           :joins => options[:joins],
@@ -243,7 +248,7 @@ module ActiveRecord
         table_name = reflection.klass.quoted_table_name
 
         if interface = reflection.options[:as]
-          conditions = "#{reflection.klass.quoted_table_name}.#{connection.quote_column_name "#{interface}_id"} IN (?) and #{reflection.klass.quoted_table_name}.#{connection.quote_column_name "#{interface}_type"} = '#{self.base_class.name.demodulize}'"
+          conditions = "#{reflection.klass.quoted_table_name}.#{connection.quote_column_name "#{interface}_id"} IN (?) and #{reflection.klass.quoted_table_name}.#{connection.quote_column_name "#{interface}_type"} = '#{self.base_class.sti_name}'"
         else
           foreign_key = reflection.primary_key_name
           conditions = "#{reflection.klass.quoted_table_name}.#{foreign_key} IN (?)"
diff --git a/vendor/rails/activerecord/lib/active_record/associations.rb b/vendor/rails/activerecord/lib/active_record/associations.rb
index a3d1bbba..ac1e319c 100755
--- a/vendor/rails/activerecord/lib/active_record/associations.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations.rb
@@ -690,6 +690,7 @@ module ActiveRecord
       #   association is a polymorphic +belongs_to+.
       # * <tt>:uniq</tt> - If true, duplicates will be omitted from the collection. Useful in conjunction with <tt>:through</tt>.
       # * <tt>:readonly</tt> - If true, all the associated objects are readonly through the association.
+      # * <tt>:validate</tt> - If false, don't validate the associated objects when saving the parent object. true by default.
       #
       # Option examples:
       #   has_many :comments, :order => "posted_on"
@@ -710,6 +711,7 @@ module ActiveRecord
 
         configure_dependency_for_has_many(reflection)
 
+        add_multiple_associated_validation_callbacks(reflection.name) unless options[:validate] == false
         add_multiple_associated_save_callbacks(reflection.name)
         add_association_callbacks(reflection.name, reflection.options)
 
@@ -769,6 +771,7 @@ module ActiveRecord
       # * <tt>:source_type</tt> - Specifies type of the source association used by <tt>has_one :through</tt> queries where the source
       #   association is a polymorphic +belongs_to+.      
       # * <tt>:readonly</tt> - If true, the associated object is readonly through the association.
+      # * <tt>:validate</tt> - If false, don't validate the associated object when saving the parent object. +false+ by default.
       #
       # Option examples:
       #   has_one :credit_card, :dependent => :destroy  # destroys the associated credit card
@@ -799,7 +802,7 @@ module ActiveRecord
           end
           after_save method_name
 
-          add_single_associated_save_callbacks(reflection.name) 
+          add_single_associated_validation_callbacks(reflection.name) if options[:validate] == true
           association_accessor_methods(reflection, HasOneAssociation)
           association_constructor_method(:build,  reflection, HasOneAssociation)
           association_constructor_method(:create, reflection, HasOneAssociation)
@@ -857,6 +860,7 @@ module ActiveRecord
       #   Note: If you've enabled the counter cache, then you may want to add the counter cache attribute
       #   to the +attr_readonly+ list in the associated classes (e.g. <tt>class Post; attr_readonly :comments_count; end</tt>).
       # * <tt>:readonly</tt> - If true, the associated object is readonly through the association.
+      # * <tt>:validate</tt> - If false, don't validate the associated objects when saving the parent object. +false+ by default.
       #
       # Option examples:
       #   belongs_to :firm, :foreign_key => "client_of"
@@ -937,6 +941,8 @@ module ActiveRecord
           )
         end
 
+        add_single_associated_validation_callbacks(reflection.name) if options[:validate] == true
+
         configure_dependency_for_belongs_to(reflection)
       end
 
@@ -1025,6 +1031,7 @@ module ActiveRecord
       # * <tt>:select</tt> - By default, this is <tt>*</tt> as in <tt>SELECT * FROM</tt>, but can be changed if, for example, you want to do a join
       #   but not include the joined columns. Do not forget to include the primary and foreign keys, otherwise it will raise an error.
       # * <tt>:readonly</tt> - If true, all the associated objects are readonly through the association.
+      # * <tt>:validate</tt> - If false, don't validate the associated objects when saving the parent object. +true+ by default.
       #
       # Option examples:
       #   has_and_belongs_to_many :projects
@@ -1037,6 +1044,7 @@ module ActiveRecord
       def has_and_belongs_to_many(association_id, options = {}, &extension)
         reflection = create_has_and_belongs_to_many_reflection(association_id, options, &extension)
 
+        add_multiple_associated_validation_callbacks(reflection.name) unless options[:validate] == false
         add_multiple_associated_save_callbacks(reflection.name)
         collection_accessor_methods(reflection, HasAndBelongsToManyAssociation)
 
@@ -1103,10 +1111,9 @@ module ActiveRecord
               association.create_through_record(new_value)
               self.send(reflection.name, new_value)
             else
-              association.replace(new_value)              
+              association.replace(new_value)
+              instance_variable_set(ivar, new_value.nil? ? nil : association)
             end
-
-            instance_variable_set(ivar, new_value.nil? ? nil : association)
           end
 
           define_method("set_#{reflection.name}_target") do |target|
@@ -1157,7 +1164,7 @@ module ActiveRecord
           end
         end
         
-        def add_single_associated_save_callbacks(association_name)
+        def add_single_associated_validation_callbacks(association_name)
           method_name = "validate_associated_records_for_#{association_name}".to_sym
           define_method(method_name) do
             association = instance_variable_get("@#{association_name}")
@@ -1169,7 +1176,7 @@ module ActiveRecord
           validate method_name
         end
         
-        def add_multiple_associated_save_callbacks(association_name)
+        def add_multiple_associated_validation_callbacks(association_name)
           method_name = "validate_associated_records_for_#{association_name}".to_sym
           ivar = "@#{association_name}"
 
@@ -1190,6 +1197,10 @@ module ActiveRecord
           end
 
           validate method_name
+        end
+
+        def add_multiple_associated_save_callbacks(association_name)
+          ivar = "@#{association_name}"
 
           method_name = "before_save_associated_records_for_#{association_name}".to_sym
           define_method(method_name) do
@@ -1211,7 +1222,6 @@ module ActiveRecord
             else
               []
             end
-
             records_to_save.each { |record| association.send(:insert_record, record) } unless records_to_save.blank?
 
             # reconstruct the SQL queries now that we know the owner's id
@@ -1343,7 +1353,8 @@ module ActiveRecord
             :uniq,
             :finder_sql, :counter_sql,
             :before_add, :after_add, :before_remove, :after_remove,
-            :extend, :readonly
+            :extend, :readonly,
+            :validate
           )
 
           options[:extend] = create_extension_modules(association_id, extension, options[:extend])
@@ -1353,7 +1364,7 @@ module ActiveRecord
 
         def create_has_one_reflection(association_id, options)
           options.assert_valid_keys(
-            :class_name, :foreign_key, :remote, :select, :conditions, :order, :include, :dependent, :counter_cache, :extend, :as, :readonly
+            :class_name, :foreign_key, :remote, :select, :conditions, :order, :include, :dependent, :counter_cache, :extend, :as, :readonly, :validate
           )
 
           create_reflection(:has_one, association_id, options, self)
@@ -1361,7 +1372,7 @@ module ActiveRecord
         
         def create_has_one_through_reflection(association_id, options)
           options.assert_valid_keys(
-            :class_name, :foreign_key, :remote, :select, :conditions, :order, :include, :dependent, :counter_cache, :extend, :as, :through, :source, :source_type
+            :class_name, :foreign_key, :remote, :select, :conditions, :order, :include, :dependent, :counter_cache, :extend, :as, :through, :source, :source_type, :validate
           )
           create_reflection(:has_one, association_id, options, self)
         end
@@ -1369,7 +1380,7 @@ module ActiveRecord
         def create_belongs_to_reflection(association_id, options)
           options.assert_valid_keys(
             :class_name, :foreign_key, :foreign_type, :remote, :select, :conditions, :include, :dependent,
-            :counter_cache, :extend, :polymorphic, :readonly
+            :counter_cache, :extend, :polymorphic, :readonly, :validate
           )
 
           reflection = create_reflection(:belongs_to, association_id, options, self)
@@ -1388,7 +1399,8 @@ module ActiveRecord
             :uniq,
             :finder_sql, :delete_sql, :insert_sql,
             :before_add, :after_add, :before_remove, :after_remove,
-            :extend, :readonly
+            :extend, :readonly,
+            :validate
           )
 
           options[:extend] = create_extension_modules(association_id, extension, options[:extend])
@@ -1465,10 +1477,15 @@ module ActiveRecord
             join_dependency.joins_for_table_name(table)
           }.flatten.compact.uniq
 
+          order = options[:order]
+          if scoped_order = (scope && scope[:order])
+            order = order ? "#{order}, #{scoped_order}" : scoped_order
+          end
+
           is_distinct = !options[:joins].blank? || include_eager_conditions?(options, tables_from_conditions) || include_eager_order?(options, tables_from_order)
           sql = "SELECT "
           if is_distinct
-            sql << connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", options[:order])
+            sql << connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", order)
           else
             sql << primary_key
           end
@@ -1482,8 +1499,8 @@ module ActiveRecord
           add_conditions!(sql, options[:conditions], scope)
           add_group!(sql, options[:group], scope)
 
-          if options[:order] && is_distinct
-            connection.add_order_by_for_association_limiting!(sql, options)
+          if order && is_distinct
+            connection.add_order_by_for_association_limiting!(sql, :order => order)
           else
             add_order!(sql, options[:order], scope)
           end
@@ -1502,19 +1519,19 @@ module ActiveRecord
               else            all << cond
             end
           end
-          conditions.join(' ').scan(/([\.\w]+).?\./).flatten
+          conditions.join(' ').scan(/([\.a-zA-Z_]+).?\./).flatten
         end
 
         def order_tables(options)
-          order = options[:order]
+          order = [options[:order], scope(:find, :order) ].join(", ")
           return [] unless order && order.is_a?(String)
-          order.scan(/([\.\w]+).?\./).flatten
+          order.scan(/([\.a-zA-Z_]+).?\./).flatten
         end
 
         def selects_tables(options)
           select = options[:select]
           return [] unless select && select.is_a?(String)
-          select.scan(/"?([\.\w]+)"?.?\./).flatten
+          select.scan(/"?([\.a-zA-Z_]+)"?.?\./).flatten
         end
 
         # Checks if the conditions reference a table other than the current model table
@@ -1638,7 +1655,9 @@ module ActiveRecord
           end
 
           def join_for_table_name(table_name)
-            @joins.select{|j|j.aliased_table_name == table_name.gsub(/^\"(.*)\"$/){$1} }.first rescue nil
+            join = (@joins.select{|j|j.aliased_table_name == table_name.gsub(/^\"(.*)\"$/){$1} }.first) rescue nil
+            return join unless join.nil?
+            @joins.select{|j|j.is_a?(JoinAssociation) && j.aliased_join_table_name == table_name.gsub(/^\"(.*)\"$/){$1} }.first rescue nil
           end
 
           def joins_for_table_name(table_name)
@@ -1714,6 +1733,7 @@ module ActiveRecord
                   collection.target.push(association)
                 when :has_one
                   return if record.id.to_s != join.parent.record_id(row).to_s
+                  return if record.instance_variable_defined?("@#{join.reflection.name}")
                   association = join.instantiate(row) unless row[join.aliased_primary_key].nil?
                   record.send("set_#{join.reflection.name}_target", association)
                 when :belongs_to
@@ -1795,7 +1815,7 @@ module ActiveRecord
                 @aliased_join_table_name = aliased_table_name_for(reflection.options[:join_table], "_join")
               end
         
-              if reflection.macro == :has_many && reflection.options[:through]
+              if [:has_many, :has_one].include?(reflection.macro) && reflection.options[:through]
                 @aliased_join_table_name = aliased_table_name_for(reflection.through_reflection.klass.table_name, "_join")
               end
             end
@@ -1819,7 +1839,7 @@ module ActiveRecord
                      ]
                 when :has_many, :has_one
                   case
-                    when reflection.macro == :has_many && reflection.options[:through]
+                    when reflection.options[:through]
                       through_conditions = through_reflection.options[:conditions] ? "AND #{interpolate_sql(sanitize_sql(through_reflection.options[:conditions]))}" : ''
 
                       jt_foreign_key = jt_as_extra = jt_source_extra = jt_sti_extra = nil
@@ -1855,7 +1875,7 @@ module ActiveRecord
                           jt_sti_extra = " AND %s.%s = %s" % [
                             connection.quote_table_name(aliased_join_table_name),
                             connection.quote_column_name(through_reflection.active_record.inheritance_column),
-                            through_reflection.klass.quote_value(through_reflection.klass.name.demodulize)]
+                            through_reflection.klass.quote_value(through_reflection.klass.sti_name)]
                         end
                       when :belongs_to
                         first_key = primary_key
@@ -1920,10 +1940,8 @@ module ActiveRecord
                 else
                   ""
               end || ''
-              join << %(AND %s.%s = %s ) % [
-                connection.quote_table_name(aliased_table_name),
-                connection.quote_column_name(klass.inheritance_column),
-                klass.quote_value(klass.name.demodulize)] unless klass.descends_from_active_record?
+              join << %(AND %s) % [
+                klass.send(:type_condition, aliased_table_name)] unless klass.descends_from_active_record?
 
               [through_reflection, reflection].each do |ref|
                 join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions]))} " if ref && ref.options[:conditions]
diff --git a/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb b/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb
index 52d2a986..ae409c90 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb
@@ -78,11 +78,14 @@ module ActiveRecord
         @loaded = false
       end
 
-      def build(attributes = {})
+      def build(attributes = {}, &block)
         if attributes.is_a?(Array)
-          attributes.collect { |attr| build(attr) }
+          attributes.collect { |attr| build(attr, &block) }
         else
-          build_record(attributes) { |record| set_belongs_to_association_for(record) }
+          build_record(attributes) do |record|
+            block.call(record) if block_given?
+            set_belongs_to_association_for(record)
+          end
         end
       end
 
@@ -187,7 +190,7 @@ module ActiveRecord
         if @owner.new_record? || (loaded? && !@reflection.options[:uniq])
           @target.size
         elsif !loaded? && !@reflection.options[:uniq] && @target.is_a?(Array)
-          unsaved_records = Array(@target.detect { |r| r.new_record? })
+          unsaved_records = @target.select { |r| r.new_record? }
           unsaved_records.size + count_records
         else
           count_records
@@ -335,7 +338,7 @@ module ActiveRecord
           callback(:before_add, record)
           yield(record) if block_given?
           @target ||= [] unless loaded?
-          @target << record
+          @target << record unless @reflection.options[:uniq] && @target.include?(record)
           callback(:after_add, record)
           record
         end
diff --git a/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb b/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb
index 11c64243..e794a69c 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb
@@ -69,8 +69,8 @@ module ActiveRecord
         @target
       end
 
-      def respond_to?(symbol, include_priv = false)
-        proxy_respond_to?(symbol, include_priv) || (load_target && @target.respond_to?(symbol, include_priv))
+      def respond_to?(*args)
+        proxy_respond_to?(*args) || (load_target && @target.respond_to?(*args))
       end
 
       # Explicitly proxy === because the instance method removal above
@@ -131,10 +131,6 @@ module ActiveRecord
           records.map { |record| record.quoted_id }.join(',')
         end
 
-        def interpolate_sql_options!(options, *keys)
-          keys.each { |key| options[key] &&= interpolate_sql(options[key]) }
-        end
-
         def interpolate_sql(sql, record = nil)
           @owner.send(:interpolate_sql, sql, record)
         end
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 4fa8e9d0..257d2ff2 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -70,10 +70,8 @@ module ActiveRecord
         end
 
         def construct_sql
-          interpolate_sql_options!(@reflection.options, :finder_sql)
-
           if @reflection.options[:finder_sql]
-            @finder_sql = @reflection.options[:finder_sql]
+            @finder_sql = interpolate_sql(@reflection.options[:finder_sql])
           else
             @finder_sql = "#{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.primary_key_name} = #{@owner.quoted_id} "
             @finder_sql << " AND (#{conditions})" if conditions
@@ -87,6 +85,7 @@ module ActiveRecord
                         :joins => @join_sql,
                         :readonly => false,
                         :order => @reflection.options[:order],
+                        :include => @reflection.options[:include],
                         :limit => @reflection.options[:limit] } }
         end
 
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb
index f584a97c..7006b212 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb
@@ -14,7 +14,16 @@ module ActiveRecord
             @finder_sql + " AND (#{sanitize_sql(options[:conditions])})"
           options[:include] ||= @reflection.options[:include]
 
-          @reflection.klass.count(column_name, options)
+          value = @reflection.klass.count(column_name, options)
+
+          limit  = @reflection.options[:limit]
+          offset = @reflection.options[:offset]
+
+          if limit || offset
+            [ [value - offset.to_i, 0].max, limit.to_i ].min
+          else
+            value
+          end
         end
       end
 
@@ -27,8 +36,11 @@ module ActiveRecord
           else
             @reflection.klass.count(:conditions => @counter_sql, :include => @reflection.options[:include])
           end
-          
-          @target = [] and loaded if count == 0
+
+          # If there's nothing in the database and @target has no new records
+          # we are certain the current target is an empty array. This is a
+          # documented side-effect of the method that may avoid an extra SELECT.
+          @target ||= [] and loaded if count == 0
           
           if @reflection.options[:limit]
             count = [ @reflection.options[:limit], count ].min
@@ -100,7 +112,7 @@ module ActiveRecord
           create_scoping = {}
           set_belongs_to_association_for(create_scoping)
           {
-            :find => { :conditions => @finder_sql, :readonly => false, :order => @reflection.options[:order], :limit => @reflection.options[:limit] },
+            :find => { :conditions => @finder_sql, :readonly => false, :order => @reflection.options[:order], :limit => @reflection.options[:limit], :include => @reflection.options[:include]},
             :create => create_scoping
           }
         end
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb
index 52ced36d..3750a2c3 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -237,7 +237,7 @@ module ActiveRecord
         end
         
         def build_sti_condition
-          "#{@reflection.through_reflection.quoted_table_name}.#{@reflection.through_reflection.klass.inheritance_column} = #{@reflection.klass.quote_value(@reflection.through_reflection.klass.sti_name)}"
+          @reflection.through_reflection.klass.send(:type_condition)
         end
 
         alias_method :sql_conditions, :conditions
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb
index c2b3503e..a0b943b5 100755
--- a/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb
@@ -21,8 +21,8 @@ module ActiveRecord
       def replace(obj, dont_save = false)
         load_target
 
-        unless @target.nil?
-          if dependent? && !dont_save && @target != obj
+        unless @target.nil? || @target == obj
+          if dependent? && !dont_save
             @target.destroy unless @target.new_record?
             @owner.clear_association_cache
           else
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb
index c846956e..b78bd5d9 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb
@@ -22,6 +22,10 @@ module ActiveRecord
     
       def find_target
         super.first
+      end
+
+      def reset_target!
+        @target = nil
       end        
     end        
   end
diff --git a/vendor/rails/activerecord/lib/active_record/base.rb b/vendor/rails/activerecord/lib/active_record/base.rb
index 92a24ecc..60fd9956 100755
--- a/vendor/rails/activerecord/lib/active_record/base.rb
+++ b/vendor/rails/activerecord/lib/active_record/base.rb
@@ -372,7 +372,7 @@ module ActiveRecord #:nodoc:
     def self.reset_subclasses #:nodoc:
       nonreloadables = []
       subclasses.each do |klass|
-        unless Dependencies.autoloaded? klass
+        unless ActiveSupport::Dependencies.autoloaded? klass
           nonreloadables << klass
           next
         end
@@ -439,6 +439,10 @@ module ActiveRecord #:nodoc:
     cattr_accessor :schema_format , :instance_writer => false
     @@schema_format = :ruby
 
+    # Specify whether or not to use timestamps for migration numbers
+    cattr_accessor :timestamped_migrations , :instance_writer => false
+    @@timestamped_migrations = true
+
     # Determine whether to store the full constant name including namespace when using STI
     superclass_delegating_accessor :store_full_sti_class
     self.store_full_sti_class = false
@@ -828,7 +832,7 @@ module ActiveRecord #:nodoc:
       def update_counters(id, counters)
         updates = counters.inject([]) { |list, (counter_name, increment)|
           sign = increment < 0 ? "-" : "+"
-          list << "#{connection.quote_column_name(counter_name)} = #{connection.quote_column_name(counter_name)} #{sign} #{increment.abs}"
+          list << "#{connection.quote_column_name(counter_name)} = COALESCE(#{connection.quote_column_name(counter_name)}, 0) #{sign} #{increment.abs}"
         }.join(", ")
         update_all(updates, "#{connection.quote_column_name(primary_key)} = #{quote_value(id)}")
       end
@@ -1465,7 +1469,7 @@ module ActiveRecord #:nodoc:
 
         def construct_finder_sql(options)
           scope = scope(:find)
-          sql  = "SELECT #{options[:select] || (scope && scope[:select]) || (options[:joins] && quoted_table_name + '.*') || '*'} "
+          sql  = "SELECT #{options[:select] || (scope && scope[:select]) || ((options[:joins] || (scope && scope[:joins])) && quoted_table_name + '.*') || '*'} "
           sql << "FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
 
           add_joins!(sql, options, scope)
@@ -1577,10 +1581,11 @@ module ActiveRecord #:nodoc:
           sql << "WHERE #{merged_conditions} " unless merged_conditions.blank?
         end
 
-        def type_condition
+        def type_condition(table_alias=nil)
+          quoted_table_alias = self.connection.quote_table_name(table_alias || table_name)
           quoted_inheritance_column = connection.quote_column_name(inheritance_column)
-          type_condition = subclasses.inject("#{quoted_table_name}.#{quoted_inheritance_column} = '#{sti_name}' ") do |condition, subclass|
-            condition << "OR #{quoted_table_name}.#{quoted_inheritance_column} = '#{subclass.sti_name}' "
+          type_condition = subclasses.inject("#{quoted_table_alias}.#{quoted_inheritance_column} = '#{sti_name}' ") do |condition, subclass|
+            condition << "OR #{quoted_table_alias}.#{quoted_inheritance_column} = '#{subclass.sti_name}' "
           end
 
           " (#{type_condition}) "
@@ -1717,7 +1722,7 @@ module ActiveRecord #:nodoc:
         def attribute_condition(argument)
           case argument
             when nil   then "IS ?"
-            when Array, ActiveRecord::Associations::AssociationCollection then "IN (?)"
+            when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope then "IN (?)"
             when Range then "BETWEEN ? AND ?"
             else            "= ?"
           end
@@ -2053,9 +2058,10 @@ module ActiveRecord #:nodoc:
         end
 
         def replace_named_bind_variables(statement, bind_vars) #:nodoc:
-          statement.gsub(/:([a-zA-Z]\w*)/) do
-            match = $1.to_sym
-            if bind_vars.include?(match)
+          statement.gsub(/(:?):([a-zA-Z]\w*)/) do
+            if $1 == ':' # skip postgresql casts
+              $& # return the whole match
+            elsif bind_vars.include?(match = $2.to_sym)
               quote_bound_value(bind_vars[match])
             else
               raise PreparedStatementInvalid, "missing value for :#{match} in #{statement}"
@@ -2064,13 +2070,18 @@ module ActiveRecord #:nodoc:
         end
 
         def expand_range_bind_variables(bind_vars) #:nodoc:
-          bind_vars.sum do |var|
+          expanded = []
+
+          bind_vars.each do |var|
             if var.is_a?(Range)
-              [var.first, var.last]
+              expanded << var.first
+              expanded << var.last
             else
-              [var]
+              expanded << var
             end
           end
+
+          expanded
         end
 
         def quote_bound_value(value) #:nodoc:
@@ -2572,8 +2583,15 @@ module ActiveRecord #:nodoc:
         quoted = {}
         connection = self.class.connection
         attribute_names.each do |name|
-          if column = column_for_attribute(name)
-            quoted[name] = connection.quote(read_attribute(name), column) unless !include_primary_key && column.primary
+          if (column = column_for_attribute(name)) && (include_primary_key || !column.primary)
+            value = read_attribute(name)
+
+            # We need explicit to_yaml because quote() does not properly convert Time/Date fields to YAML.
+            if value && self.class.serialized_attributes.has_key?(name) && (value.acts_like?(:date) || value.acts_like?(:time))
+              value = value.to_yaml
+            end
+
+            quoted[name] = connection.quote(value, column)
           end
         end
         include_readonly_attributes ? quoted : remove_readonly_attributes(quoted)
diff --git a/vendor/rails/activerecord/lib/active_record/calculations.rb b/vendor/rails/activerecord/lib/active_record/calculations.rb
index 10e8330d..254a55f9 100644
--- a/vendor/rails/activerecord/lib/active_record/calculations.rb
+++ b/vendor/rails/activerecord/lib/active_record/calculations.rb
@@ -1,6 +1,6 @@
 module ActiveRecord
   module Calculations #:nodoc:
-    CALCULATIONS_OPTIONS = [:conditions, :joins, :order, :select, :group, :having, :distinct, :limit, :offset, :include]
+    CALCULATIONS_OPTIONS = [:conditions, :joins, :order, :select, :group, :having, :distinct, :limit, :offset, :include, :from]
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -27,6 +27,8 @@ module ActiveRecord
       # * <tt>:select</tt>: By default, this is * as in SELECT * FROM, but can be changed if you, for example, want to do a join but not
       #   include the joined columns.
       # * <tt>:distinct</tt>: Set this to true to make this a distinct calculation, such as SELECT COUNT(DISTINCT posts.id) ...
+      # * <tt>:from</tt> - By default, this is the table name of the class, but can be changed to an alternate table name (or even the name
+      #   of a database view).
       #
       # Examples for counting all:
       #   Person.count         # returns the total count of all people
@@ -71,7 +73,7 @@ module ActiveRecord
       #
       #   Person.sum('age')
       def sum(column_name, options = {})
-        calculate(:sum, column_name, options) || 0
+        calculate(:sum, column_name, options)
       end
 
       # This calculates aggregate values in the given column.  Methods for count, sum, average, minimum, and maximum have been added as shortcuts.
@@ -178,13 +180,23 @@ module ActiveRecord
           sql = "SELECT COUNT(*) AS #{aggregate_alias}" if use_workaround
 
           sql << ", #{options[:group_field]} AS #{options[:group_alias]}" if options[:group]
-          sql << " FROM (SELECT #{distinct}#{column_name}" if use_workaround
-          sql << " FROM #{connection.quote_table_name(table_name)} "
+          if options[:from]
+            sql << " FROM #{options[:from]} "
+          else
+            sql << " FROM (SELECT #{distinct}#{column_name}" if use_workaround
+            sql << " FROM #{connection.quote_table_name(table_name)} "
+          end
+
+          joins = ""
+          add_joins!(joins, options, scope)
+
           if merged_includes.any?
-            join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, options[:joins])
+            join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, joins)
             sql << join_dependency.join_associations.collect{|join| join.association_join }.join
           end
-          add_joins!(sql, options, scope)
+
+          sql << joins unless joins.blank?
+
           add_conditions!(sql, options[:conditions], scope)
           add_limited_ids_condition!(sql, options, join_dependency) if join_dependency && !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
 
@@ -205,7 +217,7 @@ module ActiveRecord
 
           sql << " ORDER BY #{options[:order]} "       if options[:order]
           add_limit!(sql, options, scope)
-          sql << ')' if use_workaround
+          sql << ') AS #{aggregate_alias}_subquery' if use_workaround
           sql
         end
 
@@ -266,6 +278,7 @@ module ActiveRecord
           operation = operation.to_s.downcase
           case operation
             when 'count' then value.to_i
+            when 'sum'   then value =~ /\./ ? value.to_f : value.to_i
             when 'avg'   then value && value.to_f
             else column ? column.type_cast(value) : value
           end
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index f968b9b1..f0eeeb29 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -257,7 +257,10 @@ module ActiveRecord
 
       def to_sql
         column_sql = "#{base.quote_column_name(name)} #{sql_type}"
-        add_column_options!(column_sql, :null => null, :default => default) unless type.to_sym == :primary_key
+        column_options = {}
+        column_options[:null] = null unless null.nil?
+        column_options[:default] = default unless default.nil?
+        add_column_options!(column_sql, column_options) unless type.to_sym == :primary_key
         column_sql
       end
       alias to_s :to_sql
@@ -304,8 +307,7 @@ module ActiveRecord
       #
       # Available options are (none of these exists by default):
       # * <tt>:limit</tt> -
-      #   Requests a maximum column length (<tt>:string</tt>, <tt>:text</tt>,
-      #   <tt>:binary</tt> or <tt>:integer</tt> columns only)
+      #   Requests a maximum column length. This is number of characters for <tt>:string</tt> and <tt>:text</tt> columns and number of bytes for :binary and :integer columns.
       # * <tt>:default</tt> -
       #   The column's default value. Use nil for NULL.
       # * <tt>:null</tt> -
@@ -442,9 +444,10 @@ module ActiveRecord
 
       # Appends <tt>:datetime</tt> columns <tt>:created_at</tt> and
       # <tt>:updated_at</tt> to the table.
-      def timestamps
-        column(:created_at, :datetime)
-        column(:updated_at, :datetime)
+      def timestamps(*args)
+        options = args.extract_options!
+        column(:created_at, :datetime, options)
+        column(:updated_at, :datetime, options)
       end
 
       def references(*args)
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 67d70b38..5984ef2d 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -331,15 +331,26 @@ module ActiveRecord
       end
 
       def assume_migrated_upto_version(version)
+        version = version.to_i
         sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
+
         migrated = select_values("SELECT version FROM #{sm_table}").map(&:to_i)
         versions = Dir['db/migrate/[0-9]*_*.rb'].map do |filename|
           filename.split('/').last.split('_').first.to_i
         end
 
-        execute "INSERT INTO #{sm_table} (version) VALUES ('#{version}')" unless migrated.include?(version.to_i)
-        (versions - migrated).select { |v| v < version.to_i }.each do |v|
-          execute "INSERT INTO #{sm_table} (version) VALUES ('#{v}')"
+        unless migrated.include?(version)
+          execute "INSERT INTO #{sm_table} (version) VALUES ('#{version}')"
+        end
+
+        inserted = Set.new
+        (versions - migrated).each do |v|
+          if inserted.include?(v)
+            raise "Duplicate migration #{v}. Please renumber your migrations to resolve the conflict."
+          elsif v < version
+            execute "INSERT INTO #{sm_table} (version) VALUES ('#{v}')"
+            inserted << v
+          end
         end
       end
 
@@ -372,13 +383,9 @@ module ActiveRecord
 
       def add_column_options!(sql, options) #:nodoc:
         sql << " DEFAULT #{quote(options[:default], options[:column])}" if options_include_default?(options)
-        # must explcitly check for :null to allow change_column to work on migrations
-        if options.has_key? :null
-          if options[:null] == false
-            sql << " NOT NULL"
-          else
-            sql << " NULL"
-          end
+        # must explicitly check for :null to allow change_column to work on migrations
+        if options[:null] == false
+          sql << " NOT NULL"
         end
       end
 
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index f00a2c89..c6728029 100755
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -50,10 +50,7 @@ module ActiveRecord
         rescue LoadError => cannot_require_mysql
           # Use the bundled Ruby/MySQL driver if no driver is already in place
           begin
-            ActiveRecord::Base.logger.info(
-              "WARNING: You're using the Ruby-based MySQL library that ships with Rails. This library is not suited for production. " +
-              "Please install the C-based MySQL library instead (gem install mysql)."
-            ) if ActiveRecord::Base.logger
+            ActiveSupport::Deprecation.warn "You're using the Ruby-based MySQL library that ships with Rails. This library will be REMOVED FROM RAILS 2.2. Please switch to the offical mysql gem: `gem install mysql`", caller
 
             require 'active_record/vendor/mysql'
           rescue LoadError
@@ -113,7 +110,8 @@ module ActiveRecord
         end
 
         def extract_limit(sql_type)
-          if sql_type =~ /blob|text/i
+          case sql_type
+          when /blob|text/i
             case sql_type
             when /tiny/i
               255
@@ -124,6 +122,11 @@ module ActiveRecord
             else
               super # we could return 65535 here, but we leave it undecorated by default
             end
+          when /^bigint/i;    8
+          when /^int/i;       4
+          when /^mediumint/i; 3
+          when /^smallint/i;  2
+          when /^tinyint/i;   1
           else
             super
           end
@@ -193,10 +196,10 @@ module ActiveRecord
 
       def native_database_types #:nodoc:
         {
-          :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY",
+          :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY".freeze,
           :string      => { :name => "varchar", :limit => 255 },
           :text        => { :name => "text" },
-          :integer     => { :name => "int"},
+          :integer     => { :name => "int", :limit => 4 },
           :float       => { :name => "float" },
           :decimal     => { :name => "decimal" },
           :datetime    => { :name => "datetime" },
@@ -336,10 +339,11 @@ module ActiveRecord
 
       def add_limit_offset!(sql, options) #:nodoc:
         if limit = options[:limit]
+          limit = sanitize_limit(limit)
           unless offset = options[:offset]
             sql << " LIMIT #{limit}"
           else
-            sql << " LIMIT #{offset}, #{limit}"
+            sql << " LIMIT #{offset.to_i}, #{limit}"
           end
         end
       end
@@ -439,18 +443,29 @@ module ActiveRecord
       end
 
       def change_column_default(table_name, column_name, default) #:nodoc:
-        current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'")["Type"]
+        column = column_for(table_name, column_name)
+        change_column table_name, column_name, column.sql_type, :default => default
+      end
 
-        execute("ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{current_type} DEFAULT #{quote(default)}")
+      def change_column_null(table_name, column_name, null, default = nil)
+        column = column_for(table_name, column_name)
+
+        unless null || default.nil?
+          execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+        end
+
+        change_column table_name, column_name, column.sql_type, :null => null
       end
 
       def change_column(table_name, column_name, type, options = {}) #:nodoc:
+        column = column_for(table_name, column_name)
+
         unless options_include_default?(options)
-          if column = columns(table_name).find { |c| c.name == column_name.to_s }
-            options[:default] = column.default
-          else
-            raise "No such column: #{table_name}.#{column_name}"
-          end
+          options[:default] = column.default
+        end
+
+        unless options.has_key?(:null)
+          options[:null] = column.null
         end
 
         change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
@@ -459,8 +474,17 @@ module ActiveRecord
       end
 
       def rename_column(table_name, column_name, new_column_name) #:nodoc:
+        options = {}
+        if column = columns(table_name).find { |c| c.name == column_name.to_s }
+          options[:default] = column.default
+          options[:null] = column.null
+        else
+          raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
+        end
         current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'")["Type"]
-        execute "ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}"
+        rename_column_sql = "ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}"
+        add_column_options!(rename_column_sql, options)
+        execute(rename_column_sql)
       end
 
       # Maps logical Rails types to MySQL-specific data types.
@@ -468,14 +492,12 @@ module ActiveRecord
         return super unless type.to_s == 'integer'
 
         case limit
-        when 0..3
-          "smallint(#{limit})"
-        when 4..8
-          "int(#{limit})"
-        when 9..20
-          "bigint(#{limit})"
-        else
-          'int(11)'
+        when 1; 'tinyint'
+        when 2; 'smallint'
+        when 3; 'mediumint'
+        when nil, 4, 11; 'int(11)'  # compatibility with MySQL default
+        when 5..8; 'bigint'
+        else raise(ActiveRecordError, "No integer type has byte size #{limit}")
         end
       end
 
@@ -525,6 +547,13 @@ module ActiveRecord
         def version
           @version ||= @connection.server_info.scan(/^(\d+)\.(\d+)\.(\d+)/).flatten.map { |v| v.to_i }
         end
+
+        def column_for(table_name, column_name)
+          unless column = columns(table_name).find { |c| c.name == column_name.to_s }
+            raise "No such column: #{table_name}.#{column_name}"
+          end
+          column
+        end
     end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 7dbfbb41..ed8912e3 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -23,8 +23,8 @@ module ActiveRecord
       config = config.symbolize_keys
       host     = config[:host]
       port     = config[:port] || 5432
-      username = config[:username].to_s
-      password = config[:password].to_s
+      username = config[:username].to_s if config[:username]
+      password = config[:password].to_s if config[:password]
 
       if config.has_key?(:database)
         database = config[:database]
@@ -47,6 +47,14 @@ module ActiveRecord
       end
 
       private
+        def extract_limit(sql_type)
+          case sql_type
+          when /^bigint/i;    8
+          when /^smallint/i;  2
+          else super
+          end
+        end
+
         # Extracts the scale from PostgreSQL-specific data types.
         def extract_scale(sql_type)
           # Money type has a fixed scale of 2.
@@ -174,8 +182,8 @@ module ActiveRecord
         def self.extract_value_from_default(default)
           case default
             # Numeric types
-            when /\A-?\d+(\.\d*)?\z/
-              default
+            when /\A\(?(-?\d+(\.\d*)?\)?)\z/
+              $1
             # Character types
             when /\A'(.*)'::(?:character varying|bpchar|text)\z/m
               $1
@@ -319,6 +327,10 @@ module ActiveRecord
         has_support
       end
 
+      def supports_insert_with_returning?
+        postgresql_version >= 80200
+      end
+
       # Returns the configured supported identifier length supported by PostgreSQL,
       # or report the default of 63 on PostgreSQL 7.x.
       def table_alias_length
@@ -360,7 +372,7 @@ module ActiveRecord
           # There are some incorrectly compiled postgres drivers out there
           # that don't define PGconn.escape.
           self.class.instance_eval do
-            undef_method(:quote_string)
+            remove_method(:quote_string)
           end
         end
         quote_string(s)
@@ -411,8 +423,34 @@ module ActiveRecord
 
       # Executes an INSERT query and returns the new record's ID
       def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
+        # Extract the table from the insert sql. Yuck.
         table = sql.split(" ", 4)[2].gsub('"', '')
-        super || pk && last_insert_id(table, sequence_name || default_sequence_name(table, pk))
+
+        # Try an insert with 'returning id' if available (PG >= 8.2)
+        if supports_insert_with_returning?
+          pk, sequence_name = *pk_and_sequence_for(table) unless pk
+          if pk
+            id = select_value("#{sql} RETURNING #{quote_column_name(pk)}")
+            clear_query_cache
+            return id
+          end
+        end
+
+        # Otherwise, insert then grab last_insert_id.
+        if insert_id = super
+          insert_id
+        else
+          # If neither pk nor sequence name is given, look them up.
+          unless pk || sequence_name
+            pk, sequence_name = *pk_and_sequence_for(table)
+          end
+
+          # If a pk is given, fallback to default sequence name.
+          # Don't fetch last insert id for a table without a pk.
+          if pk && sequence_name ||= default_sequence_name(table, pk)
+            last_insert_id(table, sequence_name)
+          end
+        end
       end
 
       # create a 2D array representing the result set
@@ -492,13 +530,13 @@ module ActiveRecord
         option_string = options.symbolize_keys.sum do |key, value|
           case key
           when :owner
-            " OWNER = '#{value}'"
+            " OWNER = \"#{value}\""
           when :template
-            " TEMPLATE = #{value}"
+            " TEMPLATE = \"#{value}\""
           when :encoding
             " ENCODING = '#{value}'"
           when :tablespace
-            " TABLESPACE = #{value}"
+            " TABLESPACE = \"#{value}\""
           when :connection_limit
             " CONNECTION LIMIT = #{value}"
           else
@@ -506,7 +544,7 @@ module ActiveRecord
           end
         end
 
-        execute "CREATE DATABASE #{name}#{option_string}"
+        execute "CREATE DATABASE #{quote_table_name(name)}#{option_string}"
       end
 
       # Drops a PostgreSQL database
@@ -514,7 +552,15 @@ module ActiveRecord
       # Example:
       #   drop_database 'matt_development'
       def drop_database(name) #:nodoc:
-        execute "DROP DATABASE IF EXISTS #{name}"
+        if postgresql_version >= 80200
+          execute "DROP DATABASE IF EXISTS #{quote_table_name(name)}"
+        else
+          begin
+            execute "DROP DATABASE #{quote_table_name(name)}"
+          rescue ActiveRecord::StatementInvalid
+            @logger.warn "#{name} database doesn't exist." if @logger
+          end
+        end
       end
 
 
@@ -676,7 +722,7 @@ module ActiveRecord
 
       # Renames a table.
       def rename_table(name, new_name)
-        execute "ALTER TABLE #{name} RENAME TO #{new_name}"
+        execute "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
       end
 
       # Adds a new column to the named table.
@@ -698,7 +744,8 @@ module ActiveRecord
 
         begin
           execute "ALTER TABLE #{quoted_table_name} ALTER COLUMN #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-        rescue ActiveRecord::StatementInvalid
+        rescue ActiveRecord::StatementInvalid => e
+          raise e if postgresql_version > 80000
           # This is PostgreSQL 7.x, so we have to use a more arcane way of doing it.
           begin
             begin_db_transaction
@@ -743,15 +790,14 @@ module ActiveRecord
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)
         return super unless type.to_s == 'integer'
 
-        if limit.nil? || limit == 4
-          'integer'
-        elsif limit < 4
-          'smallint'
-        else
-          'bigint'
+        case limit
+          when 1..2;      'smallint'
+          when 3..4, nil; 'integer'
+          when 5..8;      'bigint'
+          else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
         end
       end
-      
+
       # Returns a SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.
       #
       # PostgreSQL requires the ORDER BY columns in the select list for distinct queries, and
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 51cfd10e..84f8c028 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -238,6 +238,15 @@ module ActiveRecord
         end
       end
 
+      def change_column_null(table_name, column_name, null, default = nil)
+        unless null || default.nil?
+          execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+        end
+        alter_table(table_name) do |definition|
+          definition[column_name].null = null
+        end
+      end
+
       def change_column(table_name, column_name, type, options = {}) #:nodoc:
         alter_table(table_name) do |definition|
           include_default = options_include_default?(options)
@@ -251,6 +260,9 @@ module ActiveRecord
       end
 
       def rename_column(table_name, column_name, new_column_name) #:nodoc:
+        unless columns(table_name).detect{|c| c.name == column_name.to_s }
+          raise ActiveRecord::ActiveRecordError, "Missing column #{table_name}.#{column_name}"
+        end
         alter_table(table_name, :rename => {column_name.to_s => new_column_name.to_s})
       end
 
diff --git a/vendor/rails/activerecord/lib/active_record/dirty.rb b/vendor/rails/activerecord/lib/active_record/dirty.rb
index b32e17e9..e5831f5a 100644
--- a/vendor/rails/activerecord/lib/active_record/dirty.rb
+++ b/vendor/rails/activerecord/lib/active_record/dirty.rb
@@ -123,7 +123,10 @@ module ActiveRecord
         attr = attr.to_s
 
         # The attribute already has an unsaved change.
-        unless changed_attributes.include?(attr)
+        if changed_attributes.include?(attr)
+          old = changed_attributes[attr]
+          changed_attributes.delete(attr) unless field_changed?(attr, old, value)
+        else
           old = clone_attribute_value(:read_attribute, attr)
           changed_attributes[attr] = old if field_changed?(attr, old, value)
         end
@@ -134,7 +137,9 @@ module ActiveRecord
 
       def update_with_dirty
         if partial_updates?
-          update_without_dirty(changed)
+          # Serialized attributes should always be written in case they've been
+          # changed in place.
+          update_without_dirty(changed | self.class.serialized_attributes.keys)
         else
           update_without_dirty
         end
@@ -142,9 +147,11 @@ module ActiveRecord
 
       def field_changed?(attr, old, value)
         if column = column_for_attribute(attr)
-          if column.type == :integer && column.null && old.nil?
+          if column.type == :integer && column.null && (old.nil? || old == 0)
             # For nullable integer columns, NULL gets stored in database for blank (i.e. '') values.
             # Hence we don't record it as a change if the value changes from nil to ''.
+            # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll
+            # be typecast back to 0 (''.to_i => 0)
             value = nil if value.blank?
           else
             value = column.type_cast(value)
diff --git a/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb b/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb
index c66034d1..ff9899d0 100644
--- a/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb
+++ b/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb
@@ -68,6 +68,7 @@ module ActiveRecord
 
         def update_with_lock(attribute_names = @attributes.keys) #:nodoc:
           return update_without_lock(attribute_names) unless locking_enabled?
+          return 0 if attribute_names.empty?
 
           lock_col = self.class.locking_column
           previous_value = send(lock_col).to_i
diff --git a/vendor/rails/activerecord/lib/active_record/migration.rb b/vendor/rails/activerecord/lib/active_record/migration.rb
index b47b01e9..80598072 100644
--- a/vendor/rails/activerecord/lib/active_record/migration.rb
+++ b/vendor/rails/activerecord/lib/active_record/migration.rb
@@ -238,6 +238,22 @@ module ActiveRecord
   # lower than the current schema version: when migrating up, those
   # never-applied "interleaved" migrations will be automatically applied, and
   # when migrating down, never-applied "interleaved" migrations will be skipped.
+  # 
+  # == Timestamped Migrations
+  #
+  # By default, Rails generates migrations that look like:
+  #
+  #    20080717013526_your_migration_name.rb
+  #
+  # The prefix is a generation timestamp (in UTC).
+  #
+  # If you'd prefer to use numeric prefixes, you can turn timestamped migrations
+  # off by setting:
+  #
+  #    config.active_record.timestamped_migrations = false
+  # 
+  # In environment.rb.
+  #
   class Migration
     @@verbose = true
     cattr_accessor :verbose
@@ -369,11 +385,17 @@ module ActiveRecord
         Base.table_name_prefix + 'schema_migrations' + Base.table_name_suffix
       end
 
+      def get_all_versions
+        Base.connection.select_values("SELECT version FROM #{schema_migrations_table_name}").map(&:to_i).sort
+      end
+
       def current_version
-        version = Base.connection.select_values(
-          "SELECT version FROM #{schema_migrations_table_name}"
-        ).map(&:to_i).max rescue nil
-        version || 0
+        sm_table = schema_migrations_table_name
+        if Base.connection.table_exists?(sm_table)
+          get_all_versions.max || 0
+        else
+          0
+        end
       end
 
       def proper_table_name(name)
@@ -389,7 +411,7 @@ module ActiveRecord
     end
 
     def current_version
-      self.class.current_version
+      migrated.last || 0
     end
     
     def current_migration
@@ -399,7 +421,10 @@ module ActiveRecord
     def run
       target = migrations.detect { |m| m.version == @target_version }
       raise UnknownMigrationVersionError.new(@target_version) if target.nil?
-      target.migrate(@direction)
+      unless (up? && migrated.include?(target.version.to_i)) || (down? && !migrated.include?(target.version.to_i))
+        target.migrate(@direction)
+        record_version_state_after_migrating(target.version)
+      end
     end
 
     def migrate
@@ -470,17 +495,19 @@ module ActiveRecord
     end
 
     def migrated
-      sm_table = self.class.schema_migrations_table_name
-      Base.connection.select_values("SELECT version FROM #{sm_table}").map(&:to_i).sort
+      @migrated_versions ||= self.class.get_all_versions
     end
 
     private
       def record_version_state_after_migrating(version)
         sm_table = self.class.schema_migrations_table_name
 
+        @migrated_versions ||= []
         if down?
+          @migrated_versions.delete(version.to_i)
           Base.connection.update("DELETE FROM #{sm_table} WHERE version = '#{version}'")
         else
+          @migrated_versions.push(version.to_i).sort!
           Base.connection.insert("INSERT INTO #{sm_table} (version) VALUES ('#{version}')")
         end
       end
diff --git a/vendor/rails/activerecord/lib/active_record/named_scope.rb b/vendor/rails/activerecord/lib/active_record/named_scope.rb
index b0c8a8b8..b30ef974 100644
--- a/vendor/rails/activerecord/lib/active_record/named_scope.rb
+++ b/vendor/rails/activerecord/lib/active_record/named_scope.rb
@@ -82,6 +82,7 @@ module ActiveRecord
       #   expected_options = { :conditions => { :colored => 'red' } }
       #   assert_equal expected_options, Shirt.colored('red').proxy_options
       def named_scope(name, options = {}, &block)
+        name = name.to_sym
         scopes[name] = lambda do |parent_scope, *args|
           Scope.new(parent_scope, case options
             when Hash
@@ -102,7 +103,7 @@ module ActiveRecord
       attr_reader :proxy_scope, :proxy_options
 
       [].methods.each do |m|
-        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|find|count|sum|average|maximum|minimum|paginate|first|last|empty?)/
+        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find$|count|sum|average|maximum|minimum|paginate|first|last|empty\?|respond_to\?)/
           delegate m, :to => :proxy_found
         end
       end
@@ -139,6 +140,10 @@ module ActiveRecord
         @found ? @found.empty? : count.zero?
       end
 
+      def respond_to?(method, include_private = false)
+        super || @proxy_scope.respond_to?(method, include_private)
+      end
+
       protected
       def proxy_found
         @found || load_found
diff --git a/vendor/rails/activerecord/lib/active_record/observer.rb b/vendor/rails/activerecord/lib/active_record/observer.rb
index 6e55e36b..b35e407c 100644
--- a/vendor/rails/activerecord/lib/active_record/observer.rb
+++ b/vendor/rails/activerecord/lib/active_record/observer.rb
@@ -20,7 +20,7 @@ module ActiveRecord
       #   ActiveRecord::Base.observers = Cacher, GarbageCollector
       #
       # Note: Setting this does not instantiate the observers yet. +instantiate_observers+ is
-      # called during startup, and before each development request.  
+      # called during startup, and before each development request.
       def observers=(*observers)
         @observers = observers.flatten
       end
@@ -130,11 +130,11 @@ module ActiveRecord
   # Observers register themselves in the model class they observe, since it is the class that
   # notifies them of events when they occur. As a side-effect, when an observer is loaded its
   # corresponding model class is loaded.
-  # 
+  #
   # Up to (and including) Rails 2.0.2 observers were instantiated between plugins and
-  # application initializers. Now observers are loaded after application initializers, 
+  # application initializers. Now observers are loaded after application initializers,
   # so observed models can make use of extensions.
-  # 
+  #
   # If by any chance you are using observed models in the initialization you can still
   # load their observers by calling <tt>ModelObserver.instance</tt> before. Observers are
   # singletons and that call instantiates and registers them.
@@ -189,7 +189,9 @@ module ActiveRecord
 
       def add_observer!(klass)
         klass.add_observer(self)
-        klass.class_eval 'def after_find() end' unless klass.respond_to?(:after_find)
+        if respond_to?(:after_find) && !klass.method_defined?(:after_find)
+          klass.class_eval 'def after_find() end'
+        end
       end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/test_case.rb b/vendor/rails/activerecord/lib/active_record/test_case.rb
index 7dee962c..ca5591ae 100644
--- a/vendor/rails/activerecord/lib/active_record/test_case.rb
+++ b/vendor/rails/activerecord/lib/active_record/test_case.rb
@@ -22,11 +22,22 @@ module ActiveRecord
       end
     end
 
-    def assert_queries(num = 1)
-      $query_count = 0
+    def assert_sql(*patterns_to_match)
+      $queries_executed = []
       yield
     ensure
-      assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
+      failed_patterns = []
+      patterns_to_match.each do |pattern|
+        failed_patterns << pattern unless $queries_executed.any?{ |sql| pattern === sql }
+      end
+      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map(&:inspect).join(', ')} not found."
+    end
+
+    def assert_queries(num = 1)
+      $queries_executed = []
+      yield
+    ensure
+      assert_equal num, $queries_executed.size, "#{$queries_executed.size} instead of #{num} queries were executed."
     end
 
     def assert_no_queries(&block)
diff --git a/vendor/rails/activerecord/lib/active_record/validations.rb b/vendor/rails/activerecord/lib/active_record/validations.rb
index c97aafb1..1604836c 100755
--- a/vendor/rails/activerecord/lib/active_record/validations.rb
+++ b/vendor/rails/activerecord/lib/active_record/validations.rb
@@ -480,8 +480,9 @@ module ActiveRecord
       #     validates_length_of :fax, :in => 7..32, :allow_nil => true
       #     validates_length_of :phone, :in => 7..32, :allow_blank => true
       #     validates_length_of :user_name, :within => 6..20, :too_long => "pick a shorter name", :too_short => "pick a longer name"
-      #     validates_length_of :fav_bra_size, :minimum=>1, :too_short=>"please enter at least %d character"
-      #     validates_length_of :smurf_leader, :is=>4, :message=>"papa is spelled with %d characters... don't play me."
+      #     validates_length_of :fav_bra_size, :minimum => 1, :too_short => "please enter at least %d character"
+      #     validates_length_of :smurf_leader, :is => 4, :message => "papa is spelled with %d characters... don't play me."
+      #     validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least %d words."), :tokenizer => lambda {|str| str.scan(/\w+/) }
       #   end
       #
       # Configuration options:
@@ -492,7 +493,6 @@ module ActiveRecord
       # * <tt>:in</tt> - A synonym(or alias) for <tt>:within</tt>.
       # * <tt>:allow_nil</tt> - Attribute may be +nil+; skip validation.
       # * <tt>:allow_blank</tt> - Attribute may be blank; skip validation.
-      #
       # * <tt>:too_long</tt> - The error message if the attribute goes over the maximum (default is: "is too long (maximum is %d characters)").
       # * <tt>:too_short</tt> - The error message if the attribute goes under the minimum (default is: "is too short (min is %d characters)").
       # * <tt>:wrong_length</tt> - The error message if using the <tt>:is</tt> method and the attribute is the wrong size (default is: "is the wrong length (should be %d characters)").
@@ -504,12 +504,16 @@ module ActiveRecord
       # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
       #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).  The
       #   method, proc or string should return or evaluate to a true or false value.
+      # * <tt>:tokenizer</tt> - Specifies how to split up the attribute string. (e.g. <tt>:tokenizer => lambda {|str| str.scan(/\w+/)}</tt> to
+      #   count words as in above example.)
+      #   Defaults to <tt>lambda{ |value| value.split(//) }</tt> which counts individual characters.
       def validates_length_of(*attrs)
         # Merge given options with defaults.
         options = {
           :too_long     => ActiveRecord::Errors.default_error_messages[:too_long],
           :too_short    => ActiveRecord::Errors.default_error_messages[:too_short],
-          :wrong_length => ActiveRecord::Errors.default_error_messages[:wrong_length]
+          :wrong_length => ActiveRecord::Errors.default_error_messages[:wrong_length],
+          :tokenizer    => lambda {|value| value.split(//)}
         }.merge(DEFAULT_VALIDATION_OPTIONS)
         options.update(attrs.extract_options!.symbolize_keys)
 
@@ -536,7 +540,7 @@ module ActiveRecord
             too_long  = options[:too_long]  % option_value.end
 
             validates_each(attrs, options) do |record, attr, value|
-              value = value.split(//) if value.kind_of?(String)
+              value = options[:tokenizer].call(value) if value.kind_of?(String)
               if value.nil? or value.size < option_value.begin
                 record.errors.add(attr, too_short)
               elsif value.size > option_value.end
@@ -553,7 +557,7 @@ module ActiveRecord
             message = (options[:message] || options[message_options[option]]) % option_value
 
             validates_each(attrs, options) do |record, attr, value|
-              value = value.split(//) if value.kind_of?(String)
+              value = options[:tokenizer].call(value) if value.kind_of?(String)
               record.errors.add(attr, message) unless !value.nil? and value.size.method(validity_checks[option])[option_value]
             end
         end
@@ -614,14 +618,20 @@ module ActiveRecord
           # class (which has a database table to query from).
           finder_class = class_hierarchy.detect { |klass| !klass.abstract_class? }
 
-          if value.nil? || (configuration[:case_sensitive] || !finder_class.columns_hash[attr_name.to_s].text?)
+          is_text_column = finder_class.columns_hash[attr_name.to_s].text?
+
+          if !value.nil? && is_text_column
+            value = value.to_s
+          end
+
+          if value.nil? || (configuration[:case_sensitive] || !is_text_column)
             condition_sql = "#{record.class.quoted_table_name}.#{attr_name} #{attribute_condition(value)}"
             condition_params = [value]
           else
             # sqlite has case sensitive SELECT query, while MySQL/Postgresql don't.
             # Hence, this is needed only for sqlite.
             condition_sql = "LOWER(#{record.class.quoted_table_name}.#{attr_name}) #{attribute_condition(value)}"
-            condition_params = [value.downcase]
+            condition_params = [value.chars.downcase]
           end
 
           if scope = configuration[:scope]
@@ -851,7 +861,7 @@ module ActiveRecord
             raw_value = raw_value.to_i
           else
            begin
-              raw_value = Kernel.Float(raw_value.to_s)
+              raw_value = Kernel.Float(raw_value)
             rescue ArgumentError, TypeError
               record.errors.add(attr_name, configuration[:message] || ActiveRecord::Errors.default_error_messages[:not_a_number])
               next
diff --git a/vendor/rails/activerecord/lib/active_record/version.rb b/vendor/rails/activerecord/lib/active_record/version.rb
index aaadef99..f5e024b0 100644
--- a/vendor/rails/activerecord/lib/active_record/version.rb
+++ b/vendor/rails/activerecord/lib/active_record/version.rb
@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/activerecord/test/cases/active_schema_test_postgresql.rb b/vendor/rails/activerecord/test/cases/active_schema_test_postgresql.rb
index db325e3f..af80f724 100644
--- a/vendor/rails/activerecord/test/cases/active_schema_test_postgresql.rb
+++ b/vendor/rails/activerecord/test/cases/active_schema_test_postgresql.rb
@@ -13,8 +13,8 @@ class PostgresqlActiveSchemaTest < Test::Unit::TestCase
   end
 
   def test_create_database_with_encoding
-    assert_equal "CREATE DATABASE matt ENCODING = 'utf8'", create_database(:matt)
-    assert_equal "CREATE DATABASE aimonetti ENCODING = 'latin1'", create_database(:aimonetti, :encoding => :latin1)
+    assert_equal %(CREATE DATABASE "matt" ENCODING = 'utf8'), create_database(:matt)
+    assert_equal %(CREATE DATABASE "aimonetti" ENCODING = 'latin1'), create_database(:aimonetti, :encoding => :latin1)
   end
 
   private
diff --git a/vendor/rails/activerecord/test/cases/adapter_test.rb b/vendor/rails/activerecord/test/cases/adapter_test.rb
index c77446f8..11f98705 100644
--- a/vendor/rails/activerecord/test/cases/adapter_test.rb
+++ b/vendor/rails/activerecord/test/cases/adapter_test.rb
@@ -118,7 +118,7 @@ class AdapterTest < ActiveRecord::TestCase
     sql_inject = "1, 7 procedure help()"
     if current_adapter?(:MysqlAdapter)
       assert_equal " LIMIT 1,7", @connection.add_limit_offset!("", :limit=>sql_inject)
-      assert_equal " LIMIT 7, 1", @connection.add_limit_offset!("", :limit=>sql_inject, :offset=>7)
+      assert_equal " LIMIT 7, 1", @connection.add_limit_offset!("", :limit=> '1 ; DROP TABLE USERS', :offset=>7)
     else
       assert_equal " LIMIT 1,7", @connection.add_limit_offset!("", :limit=>sql_inject)
       assert_equal " LIMIT 1,7 OFFSET 7", @connection.add_limit_offset!("", :limit=>sql_inject, :offset=>7)
diff --git a/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb
index e0da8bfb..9c718c4f 100755
--- a/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -409,4 +409,23 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     sponsor.sponsorable = new_member
     assert_equal nil, sponsor.sponsorable_id
   end
+
+  def test_save_fails_for_invalid_belongs_to
+    assert log = AuditLog.create(:developer_id=>0,:message=>"")
+
+    log.developer = Developer.new
+    assert !log.developer.valid?
+    assert !log.valid?
+    assert !log.save
+    assert_equal "is invalid", log.errors.on("developer")
+  end
+
+  def test_save_succeeds_for_invalid_belongs_to_with_validate_false
+    assert log = AuditLog.create(:developer_id=>0,:message=>"")
+
+    log.unvalidated_developer = Developer.new
+    assert !log.unvalidated_developer.valid?
+    assert log.valid?
+    assert log.save
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index 3631be76..8c9ae8a0 100644
--- a/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -9,7 +9,7 @@ require 'models/topic'
 require 'models/reply'
 
 class CascadedEagerLoadingTest < ActiveRecord::TestCase
-  fixtures :authors, :mixins, :companies, :posts, :topics
+  fixtures :authors, :mixins, :companies, :posts, :topics, :accounts, :comments, :categorizations
 
   def test_eager_association_loading_with_cascaded_two_levels
     authors = Author.find(:all, :include=>{:posts=>:comments}, :order=>"authors.id")
@@ -68,6 +68,18 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
     end
   end
 
+  def test_eager_association_loading_with_has_many_sti_and_subclasses
+    silly = SillyReply.new(:title => "gaga", :content => "boo-boo", :parent_id => 1)
+    silly.parent_id = 1
+    assert silly.save
+
+    topics = Topic.find(:all, :include => :replies, :order => 'topics.id, replies_topics.id')
+    assert_no_queries do
+      assert_equal 2, topics[0].replies.size
+      assert_equal 0, topics[1].replies.size
+    end
+  end
+
   def test_eager_association_loading_with_belongs_to_sti
     replies = Reply.find(:all, :include => :topic, :order => 'topics.id')
     assert replies.include?(topics(:second))
diff --git a/vendor/rails/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb b/vendor/rails/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
new file mode 100644
index 00000000..7c470616
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
@@ -0,0 +1,36 @@
+require 'cases/helper'
+require 'models/post'
+require 'models/tagging'
+
+module Namespaced
+  class Post < ActiveRecord::Base
+    set_table_name 'posts'
+    has_one :tagging, :as => :taggable, :class_name => 'Tagging'
+  end
+end
+
+class EagerLoadIncludeFullStiClassNamesTest < ActiveRecord::TestCase
+
+  def setup
+    generate_test_objects
+  end
+
+  def generate_test_objects
+    post = Namespaced::Post.create( :title => 'Great stuff', :body => 'This is not', :author_id => 1 )
+    tagging = Tagging.create( :taggable => post )
+  end
+
+  def test_class_names
+    old = ActiveRecord::Base.store_full_sti_class
+
+    ActiveRecord::Base.store_full_sti_class = false
+    post = Namespaced::Post.find_by_title( 'Great stuff', :include => :tagging )
+    assert_nil post.tagging
+
+    ActiveRecord::Base.store_full_sti_class = true
+    post = Namespaced::Post.find_by_title( 'Great stuff', :include => :tagging )
+    assert_equal 'Tagging', post.tagging.class.name
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/associations/eager_test.rb b/vendor/rails/activerecord/test/cases/associations/eager_test.rb
index 3a3358e3..956a2891 100644
--- a/vendor/rails/activerecord/test/cases/associations/eager_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/eager_test.rb
@@ -14,11 +14,14 @@ require 'models/job'
 require 'models/subscriber'
 require 'models/subscription'
 require 'models/book'
+require 'models/developer'
+require 'models/project'
 
 class EagerAssociationTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :authors, :categories, :categories_posts,
             :companies, :accounts, :tags, :taggings, :people, :readers,
-            :owners, :pets, :author_favorites, :jobs, :references, :subscribers, :subscriptions, :books
+            :owners, :pets, :author_favorites, :jobs, :references, :subscribers, :subscriptions, :books,
+            :developers, :projects, :developers_projects
 
   def test_loading_with_one_association
     posts = Post.find(:all, :include => :comments)
@@ -35,6 +38,12 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert_equal Post.find(1).last_comment, post.last_comment
   end
 
+  def test_loading_with_one_association_with_non_preload
+    posts = Post.find(:all, :include => :last_comment, :order => 'comments.id DESC')
+    post = posts.find { |p| p.id == 1 }
+    assert_equal Post.find(1).last_comment, post.last_comment
+  end
+
   def test_loading_conditions_with_or
     posts = authors(:david).posts.find(:all, :include => :comments, :conditions => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE} = 'SpecialComment'")
     assert_nil posts.detect { |p| p.author_id != authors(:david).id },
@@ -556,6 +565,13 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert_nothing_raised { Post.find(:all, :include => 'comments') }
   end
 
+  def test_eager_with_floating_point_numbers
+    assert_queries(2) do
+      # Before changes, the floating point numbers will be interpreted as table names and will cause this to run in one query
+      Comment.find :all, :conditions => "123.456 = 123.456", :include => :post
+    end
+  end
+
   def test_preconfigured_includes_with_belongs_to
     author = posts(:welcome).author_with_posts
     assert_no_queries {assert_equal 5, author.posts.size}
@@ -609,4 +625,12 @@ class EagerAssociationTest < ActiveRecord::TestCase
       Comment.find :all, :include => :post
     end
   end
+
+  def test_conditions_on_join_table_with_include_and_limit
+    assert_equal 3, Developer.find(:all, :include => 'projects', :conditions => 'developers_projects.access_level = 1', :limit => 5).size
+  end
+
+  def test_order_on_join_table_with_include_and_limit
+    assert_equal 5, Developer.find(:all, :include => 'projects', :order => 'developers_projects.joined_on DESC', :limit => 5).size
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 294b993c..0572418e 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -70,7 +70,7 @@ end
 
 class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :categories, :posts, :categories_posts, :developers, :projects, :developers_projects,
-           :parrots, :pirates, :treasures, :price_estimates
+           :parrots, :pirates, :treasures, :price_estimates, :tags, :taggings
 
   def test_has_and_belongs_to_many
     david = Developer.find(1)
@@ -299,6 +299,17 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 3, projects(:active_record, :reload).developers.size
   end
 
+  def test_uniq_option_prevents_duplicate_push
+    project = projects(:active_record)
+    project.developers << developers(:jamis)
+    project.developers << developers(:david)
+    assert_equal 3, project.developers.size
+
+    project.developers << developers(:david)
+    project.developers << developers(:jamis)
+    assert_equal 3, project.developers.size
+  end
+
   def test_deleting
     david = Developer.find(1)
     active_record = Project.find(1)
@@ -439,6 +450,13 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal developers(:david), active_record.developers_with_finder_sql.find(developers(:david).id), "Ruby find"
   end
 
+  def test_find_in_association_with_custom_finder_sql_and_multiple_interpolations
+    # interpolate once:
+    assert_equal [developers(:david), developers(:jamis), developers(:poor_jamis)], projects(:active_record).developers_with_finder_sql, "first interpolation"
+    # interpolate again, for a different project id
+    assert_equal [developers(:david)], projects(:action_controller).developers_with_finder_sql, "second interpolation"
+  end
+
   def test_find_in_association_with_custom_finder_sql_and_string_id
     assert_equal developers(:david), projects(:active_record).developers_with_finder_sql.find(developers(:david).id.to_s), "SQL find"
   end
@@ -629,8 +647,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer.save
     developer.reload
     assert_equal 2, developer.projects.length
-    assert_equal projects(:active_record), developer.projects[0]
-    assert_equal projects(:action_controller), developer.projects[1]
+    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.project_ids.sort
   end
 
   def test_assign_ids_ignoring_blanks
@@ -639,8 +656,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer.save
     developer.reload
     assert_equal 2, developer.projects.length
-    assert_equal projects(:active_record), developer.projects[0]
-    assert_equal projects(:action_controller), developer.projects[1]
+    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.project_ids.sort
   end
 
   def test_select_limited_ids_list
@@ -681,4 +697,10 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal developer, project.developers.find(:first)
     assert_equal project, developer.projects.find(:first)
   end
+
+  def test_dynamic_find_should_respect_association_include
+    # SQL error in sort clause if :include is not included
+    # due to Unknown column 'authors.id'
+    assert Category.find(1).posts_with_authors_sorted_by_author_id.find_by_title('Welcome to the weblog')
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb
index dbfa025e..5704df8a 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -14,7 +14,7 @@ require 'models/reader'
 class HasManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :categories, :companies, :developers, :projects,
            :developers_projects, :topics, :authors, :comments, :author_addresses,
-           :people, :posts
+           :people, :posts, :readers
 
   def setup
     Client.destroyed_client_ids.clear
@@ -37,15 +37,21 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_counting_with_single_conditions
-    assert_equal 2, Firm.find(:first).plain_clients.count(:conditions => '1=1')
+    assert_equal 1, Firm.find(:first).plain_clients.count(:conditions => ['name=?', "Microsoft"])
   end
 
   def test_counting_with_single_hash
-    assert_equal 2, Firm.find(:first).plain_clients.count(:conditions => '1=1')
+    assert_equal 1, Firm.find(:first).plain_clients.count(:conditions => {:name => "Microsoft"})
   end
 
   def test_counting_with_column_name_and_hash
-    assert_equal 2, Firm.find(:first).plain_clients.count(:all, :conditions => '1=1')
+    assert_equal 2, Firm.find(:first).plain_clients.count(:name)
+  end
+
+  def test_counting_with_association_limit
+    firm = companies(:first_firm)
+    assert_equal firm.limited_clients.length, firm.limited_clients.size
+    assert_equal firm.limited_clients.length, firm.limited_clients.count
   end
 
   def test_finding
@@ -342,6 +348,34 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert new_firm.new_record?
   end
 
+  def test_invalid_adding_with_validate_false
+    firm = Firm.find(:first)
+    client = Client.new
+    firm.unvalidated_clients_of_firm << client
+
+    assert firm.valid?
+    assert !client.valid?
+    assert firm.save
+    assert client.new_record?
+  end
+
+  def test_valid_adding_with_validate_false
+    no_of_clients = Client.count
+
+    firm = Firm.find(:first)
+    client = Client.new("name" => "Apple")
+
+    assert firm.valid?
+    assert client.valid?
+    assert client.new_record?
+
+    firm.unvalidated_clients_of_firm << client
+
+    assert firm.save
+    assert !client.new_record?
+    assert_equal no_of_clients+1, Client.count
+  end
+
   def test_build
     company = companies(:first_firm)
     new_client = assert_no_queries { company.clients_of_firm.build("name" => "Another Client") }
@@ -356,6 +390,25 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, company.clients_of_firm(true).size
   end
 
+  def test_collection_size_after_building
+    company = companies(:first_firm)  # company already has one client
+    company.clients_of_firm.build("name" => "Another Client")
+    company.clients_of_firm.build("name" => "Yet Another Client")
+    assert_equal 3, company.clients_of_firm.size
+  end
+
+  def test_collection_size_twice_for_regressions
+    post = posts(:thinking)
+    assert_equal 0, post.readers.size
+    # This test needs a post that has no readers, we assert it to ensure it holds,
+    # but need to reload the post because the very call to #size hides the bug.
+    post.reload
+    post.readers.build
+    size1 = post.readers.size
+    size2 = post.readers.size
+    assert_equal size1, size2
+  end
+
   def test_build_many
     company = companies(:first_firm)
     new_clients = assert_no_queries { company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) }
@@ -386,6 +439,37 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, first_topic.replies.to_ary.size
   end
 
+  def test_build_via_block
+    company = companies(:first_firm)
+    new_client = assert_no_queries { company.clients_of_firm.build {|client| client.name = "Another Client" } }
+    assert !company.clients_of_firm.loaded?
+
+    assert_equal "Another Client", new_client.name
+    assert new_client.new_record?
+    assert_equal new_client, company.clients_of_firm.last
+    company.name += '-changed'
+    assert_queries(2) { assert company.save }
+    assert !new_client.new_record?
+    assert_equal 2, company.clients_of_firm(true).size
+  end
+
+  def test_build_many_via_block
+    company = companies(:first_firm)
+    new_clients = assert_no_queries do
+      company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) do |client|
+        client.name = "changed"
+      end
+    end
+
+    assert_equal 2, new_clients.size
+    assert_equal "changed", new_clients.first.name
+    assert_equal "changed", new_clients.last.name
+
+    company.name += '-changed'
+    assert_queries(3) { assert company.save }
+    assert_equal 3, company.clients_of_firm(true).size
+  end
+
   def test_create_without_loading_association
     first_firm  = companies(:first_firm)
     Firm.column_names
@@ -929,4 +1013,22 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert firm.clients.loaded?
   end
 
+  def test_joins_with_namespaced_model_should_use_correct_type
+    old = ActiveRecord::Base.store_full_sti_class
+    ActiveRecord::Base.store_full_sti_class = true
+
+    firm = Namespaced::Firm.create({ :name => 'Some Company' })
+    firm.clients.create({ :name => 'Some Client' })
+
+    stats = Namespaced::Firm.find(firm.id, {
+      :select => "#{Namespaced::Firm.table_name}.id, COUNT(#{Namespaced::Client.table_name}.id) AS num_clients",
+      :joins  => :clients,
+      :group  => "#{Namespaced::Firm.table_name}.id"
+    })
+    assert_equal 1, stats.num_clients.to_i
+
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 05155f63..652db3b9 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -187,4 +187,14 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     post.people_with_callbacks.clear
     assert_equal (%w(Michael David Julian Roger) * 2).sort, log.last(8).collect(&:last).sort
   end
+
+  def test_dynamic_find_should_respect_association_include
+    # SQL error in sort clause if :include is not included
+    # due to Unknown column 'comments.id'
+    assert Person.find(1).posts_with_comments_sorted_by_comment_id.find_by_title('Welcome to the weblog')
+  end
+
+  def test_count_with_include_should_alias_join_table
+    assert_equal 2, people(:michael).posts.count(:include => :readers)
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb
index abc7ee7e..4c907d0a 100755
--- a/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -72,6 +72,16 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_raises(ActiveRecord::RecordNotFound) { Account.find(old_account_id) }
   end
 
+  def test_natural_assignment_to_already_associated_record
+    company = companies(:first_firm)
+    account = accounts(:signals37)
+    assert_equal company.account, account
+    company.account = account
+    company.reload
+    account.reload
+    assert_equal company.account, account
+  end
+
   def test_assignment_without_replacement
     apple = Firm.create("name" => "Apple")
     citibank = Account.create("credit_limit" => 10)
@@ -275,6 +285,18 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_equal "is invalid", firm.errors.on("account")
   end
 
+
+  def test_save_succeeds_for_invalid_has_one_with_validate_false
+    firm = Firm.find(:first)
+    assert firm.valid?
+
+    firm.unvalidated_account = Account.new
+
+    assert !firm.unvalidated_account.valid?
+    assert firm.valid?
+    assert firm.save
+  end
+
   def test_assignment_before_either_saved
     firm = Firm.new("name" => "GlobalMegaCorp")
     firm.account = a = Account.new("credit_limit" => 1000)
diff --git a/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 3eb66bc9..77e3cb17 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -44,19 +44,23 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   def test_has_one_through_polymorphic
     assert_equal clubs(:moustache_club), @member.sponsor_club
   end
-  
+
   def has_one_through_to_has_many
     assert_equal 2, @member.fellow_members.size
   end
-  
+
   def test_has_one_through_eager_loading
-    members = Member.find(:all, :include => :club, :conditions => ["name = ?", "Groucho Marx"])
+    members = assert_queries(3) do #base table, through table, clubs table
+      Member.find(:all, :include => :club, :conditions => ["name = ?", "Groucho Marx"])
+    end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].club}
   end
-  
+
   def test_has_one_through_eager_loading_through_polymorphic
-    members = Member.find(:all, :include => :sponsor_club, :conditions => ["name = ?", "Groucho Marx"])
+    members = assert_queries(3) do #base table, through table, clubs table
+      Member.find(:all, :include => :sponsor_club, :conditions => ["name = ?", "Groucho Marx"])
+    end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].sponsor_club}    
   end
@@ -71,4 +75,39 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     assert_not_nil assert_no_queries {clubs[0].sponsored_member}
   end
 
+  def test_has_one_through_nonpreload_eagerloading
+    members = assert_queries(1) do
+      Member.find(:all, :include => :club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback
+    end
+    assert_equal 1, members.size
+    assert_not_nil assert_no_queries {members[0].club}
+  end
+
+  def test_has_one_through_nonpreload_eager_loading_through_polymorphic
+    members = assert_queries(1) do
+      Member.find(:all, :include => :sponsor_club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback
+    end
+    assert_equal 1, members.size
+    assert_not_nil assert_no_queries {members[0].sponsor_club}
+  end
+
+  def test_has_one_through_nonpreload_eager_loading_through_polymorphic_with_more_than_one_through_record
+    Sponsor.new(:sponsor_club => clubs(:crazy_club), :sponsorable => members(:groucho)).save!
+    members = assert_queries(1) do
+      Member.find(:all, :include => :sponsor_club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name DESC') #force fallback
+    end
+    assert_equal 1, members.size
+    assert_not_nil assert_no_queries { members[0].sponsor_club }
+    assert_equal clubs(:crazy_club), members[0].sponsor_club
+  end
+
+  def test_uninitialized_has_one_through_should_return_nil_for_unsaved_record
+    assert_nil Member.new.club
+  end
+
+  def test_assigning_association_correctly_assigns_target
+    new_member = Member.create(:name => "Chris")
+    new_member.club = new_club = Club.create(:name => "LRUG")
+    assert_equal new_club, new_member.club.target
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/join_model_test.rb b/vendor/rails/activerecord/test/cases/associations/join_model_test.rb
index 9e79d9c8..7a0427aa 100644
--- a/vendor/rails/activerecord/test/cases/associations/join_model_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/join_model_test.rb
@@ -694,6 +694,13 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert ! david.categories.include?(category)
   end
 
+  def test_has_many_through_goes_through_all_sti_classes
+    sub_sti_post = SubStiPost.create!(:title => 'test', :body => 'test', :author_id => 1)
+    new_comment = sub_sti_post.comments.create(:body => 'test')
+
+    assert_equal [9, 10, new_comment.id], authors(:david).sti_post_comments.map(&:id).sort
+  end
+
   private
     # create dynamic Post models to allow different dependency options
     def find_post_with_dependency(post_id, association, association_name, dependency)
diff --git a/vendor/rails/activerecord/test/cases/associations_test.rb b/vendor/rails/activerecord/test/cases/associations_test.rb
index 59349dd7..056a2943 100755
--- a/vendor/rails/activerecord/test/cases/associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations_test.rb
@@ -27,7 +27,7 @@ require 'models/sponsor'
 
 class AssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects, :developers_projects,
-           :computers
+           :computers, :people, :readers
 
   def test_include_with_order_works
     assert_nothing_raised {Account.find(:first, :order => 'id', :include => :firm)}
@@ -45,7 +45,7 @@ class AssociationsTest < ActiveRecord::TestCase
     assert_equal [], person.readers.find(:all)
     person.save!
     reader = Reader.create! :person => person, :post => Post.new(:title => "foo", :body => "bar")
-    assert_equal [reader], person.readers.find(:all)
+    assert person.readers.find(reader.id)
   end
 
   def test_force_reload
diff --git a/vendor/rails/activerecord/test/cases/attribute_methods_test.rb b/vendor/rails/activerecord/test/cases/attribute_methods_test.rb
index c336fd9a..7999e292 100755
--- a/vendor/rails/activerecord/test/cases/attribute_methods_test.rb
+++ b/vendor/rails/activerecord/test/cases/attribute_methods_test.rb
@@ -137,7 +137,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
       end
     end
   end
-  
+
   def test_time_attributes_are_retrieved_in_current_time_zone
     in_time_zone "Pacific Time (US & Canada)" do
       utc_time = Time.utc(2008, 1, 1)
@@ -145,7 +145,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
       record[:written_on] = utc_time
       assert_equal utc_time, record.written_on # record.written on is equal to (i.e., simultaneous with) utc_time
       assert_kind_of ActiveSupport::TimeWithZone, record.written_on # but is a TimeWithZone
-      assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone # and is in the current Time.zone
+      assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone # and is in the current Time.zone
       assert_equal Time.utc(2007, 12, 31, 16), record.written_on.time # and represents time values adjusted accordingly
     end
   end
@@ -156,7 +156,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
       record   = @target.new
       record.written_on = utc_time
       assert_equal utc_time, record.written_on
-      assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
+      assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
       assert_equal Time.utc(2007, 12, 31, 16), record.written_on.time
     end
   end
@@ -168,7 +168,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
       record   = @target.new
       record.written_on = cst_time
       assert_equal utc_time, record.written_on
-      assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
+      assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
       assert_equal Time.utc(2007, 12, 31, 16), record.written_on.time
     end
   end
@@ -181,12 +181,12 @@ class AttributeMethodsTest < ActiveRecord::TestCase
         record   = @target.new
         record.written_on = time_string
         assert_equal Time.zone.parse(time_string), record.written_on
-        assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
+        assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
         assert_equal Time.utc(2007, 12, 31, 16), record.written_on.time
       end
     end
   end
-  
+
   def test_setting_time_zone_aware_attribute_to_blank_string_returns_nil
     in_time_zone "Pacific Time (US & Canada)" do
       record   = @target.new
@@ -202,7 +202,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
         record   = @target.new
         record.written_on = time_string
         assert_equal Time.zone.parse(time_string), record.written_on
-        assert_equal TimeZone[timezone_offset], record.written_on.time_zone
+        assert_equal ActiveSupport::TimeZone[timezone_offset], record.written_on.time_zone
         assert_equal Time.utc(2008, 1, 1), record.written_on.time
       end
     end
@@ -214,7 +214,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
       record   = @target.new
       record.written_on = utc_time.in_time_zone
       assert_equal utc_time, record.written_on
-      assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
+      assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
       assert_equal Time.utc(2007, 12, 31, 16), record.written_on.time
     end
   end
@@ -223,12 +223,12 @@ class AttributeMethodsTest < ActiveRecord::TestCase
   def time_related_columns_on_topic
     Topic.columns.select{|c| [:time, :date, :datetime, :timestamp].include?(c.type)}.map(&:name)
   end
-  
+
   def in_time_zone(zone)
     old_zone  = Time.zone
     old_tz    = ActiveRecord::Base.time_zone_aware_attributes
 
-    Time.zone = zone ? TimeZone[zone] : nil
+    Time.zone = zone ? ActiveSupport::TimeZone[zone] : nil
     ActiveRecord::Base.time_zone_aware_attributes = !zone.nil?
     yield
   ensure
diff --git a/vendor/rails/activerecord/test/cases/base_test.rb b/vendor/rails/activerecord/test/cases/base_test.rb
index e07ec50c..8725c76c 100755
--- a/vendor/rails/activerecord/test/cases/base_test.rb
+++ b/vendor/rails/activerecord/test/cases/base_test.rb
@@ -19,6 +19,7 @@ require 'models/warehouse_thing'
 require 'rexml/document'
 
 class Category < ActiveRecord::Base; end
+class Categorization < ActiveRecord::Base; end
 class Smarts < ActiveRecord::Base; end
 class CreditCard < ActiveRecord::Base
   class PinNumber < ActiveRecord::Base
@@ -75,7 +76,7 @@ class TopicWithProtectedContentAndAccessibleAuthorName < ActiveRecord::Base
 end
 
 class BasicsTest < ActiveRecord::TestCase
-  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors
+  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors, :categorizations, :categories
 
   def test_table_exists
     assert !NonExistentTable.table_exists?
@@ -130,22 +131,22 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_read_attributes_before_type_cast
     category = Category.new({:name=>"Test categoty", :type => nil})
-    category_attrs = {"name"=>"Test categoty", "type" => nil}
+    category_attrs = {"name"=>"Test categoty", "type" => nil, "categorizations_count" => nil}
     assert_equal category_attrs , category.attributes_before_type_cast
   end
-  
+
   if current_adapter?(:MysqlAdapter)
     def test_read_attributes_before_type_cast_on_boolean
       bool = Booleantest.create({ "value" => false })
       assert_equal 0, bool.attributes_before_type_cast["value"]
     end
   end
-  
+
   def test_read_attributes_before_type_cast_on_datetime
     developer = Developer.find(:first)
     assert_equal developer.created_at.to_s(:db) , developer.attributes_before_type_cast["created_at"]
   end
-  
+
   def test_hash_content
     topic = Topic.new
     topic.content = { "one" => 1, "two" => 2 }
@@ -251,7 +252,7 @@ class BasicsTest < ActiveRecord::TestCase
     topic = Topic.create("title" => "New Topic")
     topicReloaded = Topic.find(topic.id)
     assert_equal(topic, topicReloaded)
-  end  
+  end
 
   def test_create_through_factory_with_block
     topic = Topic.create("title" => "New Topic") do |t|
@@ -576,7 +577,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_destroy_all
     original_count = Topic.count
     topics_by_mary = Topic.count(:conditions => mary = "author_name = 'Mary'")
-    
+
     Topic.destroy_all mary
     assert_equal original_count - topics_by_mary, Topic.count
   end
@@ -614,6 +615,22 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal -2, Topic.find(2).replies_count
   end
 
+  def test_update_counter
+    category = categories(:general)
+    assert_nil category.categorizations_count
+    assert_equal 2, category.categorizations.count
+
+    Category.update_counters(category.id, "categorizations_count" => category.categorizations.count)
+    category.reload
+    assert_not_nil category.categorizations_count
+    assert_equal 2, category.categorizations_count
+
+    Category.update_counters(category.id, "categorizations_count" => category.categorizations.count)
+    category.reload
+    assert_not_nil category.categorizations_count
+    assert_equal 4, category.categorizations_count
+  end
+
   def test_update_all
     assert_equal Topic.count, Topic.update_all("content = 'bulk updated!'")
     assert_equal "bulk updated!", Topic.find(1).content
@@ -665,7 +682,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_delete_all
     assert Topic.count > 0
-    
+
     assert_equal Topic.count, Topic.delete_all
   end
 
@@ -970,7 +987,7 @@ class BasicsTest < ActiveRecord::TestCase
     topic.attributes = attributes
     assert_equal Time.local(2004, 6, 24, 16, 24, 0), topic.written_on
   end
-  
+
   def test_multiparameter_attributes_on_time_with_old_date
     attributes = {
       "written_on(1i)" => "1850", "written_on(2i)" => "6", "written_on(3i)" => "24",
@@ -998,7 +1015,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_multiparameter_attributes_on_time_with_time_zone_aware_attributes
     ActiveRecord::Base.time_zone_aware_attributes = true
     ActiveRecord::Base.default_timezone = :utc
-    Time.zone = TimeZone[-28800]
+    Time.zone = ActiveSupport::TimeZone[-28800]
     attributes = {
       "written_on(1i)" => "2004", "written_on(2i)" => "6", "written_on(3i)" => "24",
       "written_on(4i)" => "16", "written_on(5i)" => "24", "written_on(6i)" => "00"
@@ -1016,7 +1033,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_multiparameter_attributes_on_time_with_time_zone_aware_attributes_false
     ActiveRecord::Base.time_zone_aware_attributes = false
-    Time.zone = TimeZone[-28800]
+    Time.zone = ActiveSupport::TimeZone[-28800]
     attributes = {
       "written_on(1i)" => "2004", "written_on(2i)" => "6", "written_on(3i)" => "24",
       "written_on(4i)" => "16", "written_on(5i)" => "24", "written_on(6i)" => "00"
@@ -1032,7 +1049,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_multiparameter_attributes_on_time_with_skip_time_zone_conversion_for_attributes
     ActiveRecord::Base.time_zone_aware_attributes = true
     ActiveRecord::Base.default_timezone = :utc
-    Time.zone = TimeZone[-28800]
+    Time.zone = ActiveSupport::TimeZone[-28800]
     Topic.skip_time_zone_conversion_for_attributes = [:written_on]
     attributes = {
       "written_on(1i)" => "2004", "written_on(2i)" => "6", "written_on(3i)" => "24",
@@ -1336,6 +1353,12 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal(myobj, topic.content)
   end
 
+  def test_serialized_time_attribute
+    myobj = Time.local(2008,1,1,1,0)
+    topic = Topic.create("content" => myobj).reload
+    assert_equal(myobj, topic.content)
+  end
+
   def test_nil_serialized_attribute_with_class_constraint
     myobj = MyObject.new('value1', 'value2')
     topic = Topic.new
@@ -1647,7 +1670,7 @@ class BasicsTest < ActiveRecord::TestCase
     last  = Developer.find :last
     assert_equal last, Developer.find(:first, :order => 'id desc')
   end
-  
+
   def test_last
     assert_equal Developer.find(:first, :order => 'id desc'), Developer.last
   end
@@ -1655,7 +1678,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_all_with_conditions
     assert_equal Developer.find(:all, :order => 'id desc'), Developer.all(:order => 'id desc')
   end
-  
+
   def test_find_ordered_last
     last  = Developer.find :last, :order => 'developers.salary ASC'
     assert_equal last, Developer.find(:all, :order => 'developers.salary ASC').last
@@ -1670,14 +1693,14 @@ class BasicsTest < ActiveRecord::TestCase
     last  = Developer.find :last, :order => 'developers.name, developers.salary DESC'
     assert_equal last, Developer.find(:all, :order => 'developers.name, developers.salary DESC').last
   end
-  
+
   def test_find_scoped_ordered_last
     last_developer = Developer.with_scope(:find => { :order => 'developers.salary ASC' }) do
       Developer.find(:last)
     end
     assert_equal last_developer, Developer.find(:all, :order => 'developers.salary ASC').last
   end
-  
+
   def test_abstract_class
     assert !ActiveRecord::Base.abstract_class?
     assert LoosePerson.abstract_class?
diff --git a/vendor/rails/activerecord/test/cases/calculations_test.rb b/vendor/rails/activerecord/test/cases/calculations_test.rb
index a87fc269..754fd58f 100644
--- a/vendor/rails/activerecord/test/cases/calculations_test.rb
+++ b/vendor/rails/activerecord/test/cases/calculations_test.rb
@@ -1,6 +1,7 @@
 require "cases/helper"
 require 'models/company'
 require 'models/topic'
+require 'models/edge'
 
 Company.has_many :accounts
 
@@ -99,6 +100,12 @@ class CalculationsTest < ActiveRecord::TestCase
 
   def test_should_return_zero_if_sum_conditions_return_nothing
     assert_equal 0, Account.sum(:credit_limit, :conditions => '1 = 2')
+    assert_equal 0, companies(:rails_core).companies.sum(:id, :conditions => '1 = 2')
+  end
+
+  def test_sum_should_return_valid_values_for_decimals
+    NumericData.create(:bank_balance => 19.83)
+    assert_equal 19.83, NumericData.sum(:bank_balance)
   end
 
   def test_should_group_by_summed_field_with_conditions
@@ -266,6 +273,51 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_sum_expression
-    assert_equal "636", Account.sum("2 * credit_limit")
+    assert_equal 636, Account.sum("2 * credit_limit")
   end
+
+  def test_count_with_from_option
+    assert_equal Company.count(:all), Company.count(:all, :from => 'companies')
+    assert_equal Account.count(:all, :conditions => "credit_limit = 50"),
+        Account.count(:all, :from => 'accounts', :conditions => "credit_limit = 50")
+    assert_equal Company.count(:type, :conditions => {:type => "Firm"}),
+        Company.count(:type, :conditions => {:type => "Firm"}, :from => 'companies')
+  end
+
+  def test_sum_with_from_option
+    assert_equal Account.sum(:credit_limit), Account.sum(:credit_limit, :from => 'accounts')
+    assert_equal Account.sum(:credit_limit, :conditions => "credit_limit > 50"),
+        Account.sum(:credit_limit, :from => 'accounts', :conditions => "credit_limit > 50")
+  end
+
+  def test_average_with_from_option
+    assert_equal Account.average(:credit_limit), Account.average(:credit_limit, :from => 'accounts')
+    assert_equal Account.average(:credit_limit, :conditions => "credit_limit > 50"),
+        Account.average(:credit_limit, :from => 'accounts', :conditions => "credit_limit > 50")
+  end
+
+  def test_minimum_with_from_option
+    assert_equal Account.minimum(:credit_limit), Account.minimum(:credit_limit, :from => 'accounts')
+    assert_equal Account.minimum(:credit_limit, :conditions => "credit_limit > 50"),
+        Account.minimum(:credit_limit, :from => 'accounts', :conditions => "credit_limit > 50")
+  end
+
+  def test_maximum_with_from_option
+    assert_equal Account.maximum(:credit_limit), Account.maximum(:credit_limit, :from => 'accounts')
+    assert_equal Account.maximum(:credit_limit, :conditions => "credit_limit > 50"),
+        Account.maximum(:credit_limit, :from => 'accounts', :conditions => "credit_limit > 50")
+  end
+
+  def test_from_option_with_specified_index
+    if Edge.connection.adapter_name == 'MySQL'
+      assert_equal Edge.count(:all), Edge.count(:all, :from => 'edges USE INDEX(unique_edge_index)')
+      assert_equal Edge.count(:all, :conditions => 'sink_id < 5'),
+          Edge.count(:all, :from => 'edges USE INDEX(unique_edge_index)', :conditions => 'sink_id < 5')
+    end
+  end
+
+  def test_from_option_with_table_different_than_class
+    assert_equal Account.count(:all), Company.count(:all, :from => 'accounts')
+  end
+
 end
diff --git a/vendor/rails/activerecord/test/cases/column_definition_test.rb b/vendor/rails/activerecord/test/cases/column_definition_test.rb
new file mode 100644
index 00000000..98abc8ea
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/column_definition_test.rb
@@ -0,0 +1,36 @@
+require "cases/helper"
+
+class ColumnDefinitionTest < ActiveRecord::TestCase
+  def setup
+    @adapter = ActiveRecord::ConnectionAdapters::AbstractAdapter.new(nil)
+    def @adapter.native_database_types
+      {:string => "varchar"}
+    end
+  end
+
+  # Avoid column definitions in create table statements like:
+  # `title` varchar(255) DEFAULT NULL
+  def test_should_not_include_default_clause_when_default_is_null
+    column = ActiveRecord::ConnectionAdapters::Column.new("title", nil, "varchar(20)")
+    column_def = ActiveRecord::ConnectionAdapters::ColumnDefinition.new(
+      @adapter, column.name, "string",
+      column.limit, column.precision, column.scale, column.default, column.null)
+    assert_equal "title varchar(20)", column_def.to_sql
+  end
+
+  def test_should_include_default_clause_when_default_is_present
+    column = ActiveRecord::ConnectionAdapters::Column.new("title", "Hello", "varchar(20)")
+    column_def = ActiveRecord::ConnectionAdapters::ColumnDefinition.new(
+      @adapter, column.name, "string",
+      column.limit, column.precision, column.scale, column.default, column.null)
+    assert_equal %Q{title varchar(20) DEFAULT 'Hello'}, column_def.to_sql
+  end
+
+  def test_should_specify_not_null_if_null_option_is_false
+    column = ActiveRecord::ConnectionAdapters::Column.new("title", "Hello", "varchar(20)", false)
+    column_def = ActiveRecord::ConnectionAdapters::ColumnDefinition.new(
+      @adapter, column.name, "string",
+      column.limit, column.precision, column.scale, column.default, column.null)
+    assert_equal %Q{title varchar(20) DEFAULT 'Hello' NOT NULL}, column_def.to_sql
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/database_statements_test.rb b/vendor/rails/activerecord/test/cases/database_statements_test.rb
new file mode 100644
index 00000000..6274d525
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/database_statements_test.rb
@@ -0,0 +1,12 @@
+require "cases/helper"
+
+class DatabaseStatementsTest < ActiveRecord::TestCase
+  def setup
+    @connection = ActiveRecord::Base.connection
+  end
+
+  def test_insert_should_return_the_inserted_id
+    id = @connection.insert("INSERT INTO accounts (firm_id,credit_limit) VALUES (42,5000)")
+    assert_not_nil id
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/defaults_test.rb b/vendor/rails/activerecord/test/cases/defaults_test.rb
index 2ea85417..3473b846 100644
--- a/vendor/rails/activerecord/test/cases/defaults_test.rb
+++ b/vendor/rails/activerecord/test/cases/defaults_test.rb
@@ -5,7 +5,7 @@ require 'models/entrant'
 class DefaultTest < ActiveRecord::TestCase
   def test_nil_defaults_for_not_null_columns
     column_defaults =
-      if current_adapter?(:MysqlAdapter) && Mysql.client_version < 50051
+      if current_adapter?(:MysqlAdapter) && (Mysql.client_version < 50051 || (50100..50122).include?(Mysql.client_version))
         { 'id' => nil, 'name' => '',  'course_id' => nil }
       else
         { 'id' => nil, 'name' => nil, 'course_id' => nil }
diff --git a/vendor/rails/activerecord/test/cases/dirty_test.rb b/vendor/rails/activerecord/test/cases/dirty_test.rb
index c011ffaf..4fe1d79f 100644
--- a/vendor/rails/activerecord/test/cases/dirty_test.rb
+++ b/vendor/rails/activerecord/test/cases/dirty_test.rb
@@ -2,6 +2,7 @@ require 'cases/helper'
 require 'models/topic'    # For booleans
 require 'models/pirate'   # For timestamps
 require 'models/parrot'
+require 'models/person'   # For optimistic locking
 
 class Pirate # Just reopening it, not defining it
   attr_accessor :detected_changes_in_after_update # Boolean for if changes are detected
@@ -54,6 +55,33 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
+  def test_zero_to_blank_marked_as_changed
+    pirate = Pirate.new
+    pirate.catchphrase = "Yarrrr, me hearties"
+    pirate.parrot_id = 1
+    pirate.save
+
+    # check the change from 1 to ''
+    pirate = Pirate.find_by_catchphrase("Yarrrr, me hearties")
+    pirate.parrot_id = ''
+    assert pirate.parrot_id_changed?
+    assert_equal([1, nil], pirate.parrot_id_change)
+    pirate.save
+
+    # check the change from nil to 0
+    pirate = Pirate.find_by_catchphrase("Yarrrr, me hearties")
+    pirate.parrot_id = 0
+    assert pirate.parrot_id_changed?
+    assert_equal([nil, 0], pirate.parrot_id_change)
+    pirate.save
+
+    # check the change from 0 to ''
+    pirate = Pirate.find_by_catchphrase("Yarrrr, me hearties")
+    pirate.parrot_id = ''
+    assert pirate.parrot_id_changed?
+    assert_equal([0, nil], pirate.parrot_id_change)
+  end
+
   def test_object_should_be_changed_if_any_attribute_is_changed
     pirate = Pirate.new
     assert !pirate.changed?
@@ -125,6 +153,24 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
+  def test_partial_update_with_optimistic_locking
+    person = Person.new(:first_name => 'foo')
+    old_lock_version = 1
+
+    with_partial_updates Person, false do
+      assert_queries(2) { 2.times { person.save! } }
+      Person.update_all({ :first_name => 'baz' }, :id => person.id)
+    end
+
+    with_partial_updates Person, true do
+      assert_queries(0) { 2.times { person.save! } }
+      assert_equal old_lock_version, person.reload.lock_version
+
+      assert_queries(1) { person.first_name = 'bar'; person.save! }
+      assert_not_equal old_lock_version, person.reload.lock_version
+    end
+  end
+
   def test_changed_attributes_should_be_preserved_if_save_failure
     pirate = Pirate.new
     pirate.parrot_id = 1
@@ -145,6 +191,54 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.changed?
   end
 
+  def test_reverted_changes_are_not_dirty
+    phrase = "shiver me timbers"
+    pirate = Pirate.create!(:catchphrase => phrase)
+    pirate.catchphrase = "*hic*"
+    assert pirate.changed?
+    pirate.catchphrase = phrase
+    assert !pirate.changed?
+  end
+
+  def test_reverted_changes_are_not_dirty_after_multiple_changes
+    phrase = "shiver me timbers"
+    pirate = Pirate.create!(:catchphrase => phrase)
+    10.times do |i|
+      pirate.catchphrase = "*hic*" * i
+      assert pirate.changed?
+    end
+    assert pirate.changed?
+    pirate.catchphrase = phrase
+    assert !pirate.changed?
+  end
+
+
+  def test_reverted_changes_are_not_dirty_going_from_nil_to_value_and_back
+    pirate = Pirate.create!(:catchphrase => "Yar!")
+
+    pirate.parrot_id = 1
+    assert pirate.changed?
+    assert pirate.parrot_id_changed?
+    assert !pirate.catchphrase_changed?
+
+    pirate.parrot_id = nil
+    assert !pirate.changed?
+    assert !pirate.parrot_id_changed?
+    assert !pirate.catchphrase_changed?
+  end
+
+  def test_save_should_store_serialized_attributes_even_with_partial_updates
+    with_partial_updates(Topic) do
+      topic = Topic.create!(:content => {:a => "a"})
+      topic.content[:b] = "b"
+      #assert topic.changed? # Known bug, will fail
+      topic.save!
+      assert_equal "b", topic.content[:b]
+      topic.reload
+      assert_equal "b", topic.content[:b]
+    end
+  end
+
   private
     def with_partial_updates(klass, on = true)
       old = klass.partial_updates?
diff --git a/vendor/rails/activerecord/test/cases/finder_test.rb b/vendor/rails/activerecord/test/cases/finder_test.rb
index 80936d51..f48b62ba 100644
--- a/vendor/rails/activerecord/test/cases/finder_test.rb
+++ b/vendor/rails/activerecord/test/cases/finder_test.rb
@@ -1,5 +1,6 @@
 require "cases/helper"
 require 'models/author'
+require 'models/categorization'
 require 'models/comment'
 require 'models/company'
 require 'models/topic'
@@ -394,6 +395,12 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal '1,1,1', bind('?', os)
   end
 
+  def test_named_bind_with_postgresql_type_casts
+    l = Proc.new { bind(":a::integer '2009-01-01'::date", :a => '10') }
+    assert_nothing_raised(&l)
+    assert_equal "#{ActiveRecord::Base.quote_value('10')}::integer '2009-01-01'::date", l.call
+  end
+
   def test_string_sanitation
     assert_not_equal "#{ActiveRecord::Base.connection.quoted_string_prefix}'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
     assert_equal "#{ActiveRecord::Base.connection.quoted_string_prefix}'something; select table'", ActiveRecord::Base.sanitize("something; select table")
diff --git a/vendor/rails/activerecord/test/cases/helper.rb b/vendor/rails/activerecord/test/cases/helper.rb
index dc83300e..0530ba9b 100644
--- a/vendor/rails/activerecord/test/cases/helper.rb
+++ b/vendor/rails/activerecord/test/cases/helper.rb
@@ -32,13 +32,13 @@ end
 ActiveRecord::Base.connection.class.class_eval do
   IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
 
-  def execute_with_counting(sql, name = nil, &block)
-    $query_count ||= 0
-    $query_count  += 1 unless IGNORED_SQL.any? { |r| sql =~ r }
-    execute_without_counting(sql, name, &block)
+  def execute_with_query_record(sql, name = nil, &block)
+    $queries_executed ||= []
+    $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
+    execute_without_query_record(sql, name, &block)
   end
 
-  alias_method_chain :execute, :counting
+  alias_method_chain :execute, :query_record
 end
 
 # Make with_scope public for tests
diff --git a/vendor/rails/activerecord/test/cases/inheritance_test.rb b/vendor/rails/activerecord/test/cases/inheritance_test.rb
index f09b617e..4fd38bfb 100755
--- a/vendor/rails/activerecord/test/cases/inheritance_test.rb
+++ b/vendor/rails/activerecord/test/cases/inheritance_test.rb
@@ -191,6 +191,13 @@ class InheritanceTest < ActiveRecord::TestCase
     assert_not_nil account.instance_variable_get("@firm"), "nil proves eager load failed"
   end
 
+  def test_eager_load_belongs_to_primary_key_quoting
+    con = Account.connection
+    assert_sql(/\(#{con.quote_table_name('companies')}.#{con.quote_column_name('id')} IN \(1\)\)/) do
+      Account.find(1, :include => :firm)
+    end
+  end
+
   def test_alt_eager_loading
     switch_to_alt_inheritance_column
     test_eager_load_belongs_to_something_inherited
@@ -223,11 +230,11 @@ class InheritanceComputeTypeTest < ActiveRecord::TestCase
   fixtures :companies
 
   def setup
-    Dependencies.log_activity = true
+    ActiveSupport::Dependencies.log_activity = true
   end
 
   def teardown
-    Dependencies.log_activity = false
+    ActiveSupport::Dependencies.log_activity = false
     self.class.const_remove :FirmOnTheFly rescue nil
     Firm.const_remove :FirmOnTheFly rescue nil
   end
diff --git a/vendor/rails/activerecord/test/cases/lifecycle_test.rb b/vendor/rails/activerecord/test/cases/lifecycle_test.rb
index ddcacacc..54fb3d8c 100755
--- a/vendor/rails/activerecord/test/cases/lifecycle_test.rb
+++ b/vendor/rails/activerecord/test/cases/lifecycle_test.rb
@@ -2,6 +2,7 @@ require "cases/helper"
 require 'models/topic'
 require 'models/developer'
 require 'models/reply'
+require 'models/minimalistic'
 
 class Topic; def after_find() end end
 class Developer; def after_find() end end
@@ -44,6 +45,14 @@ class TopicObserver < ActiveRecord::Observer
   end
 end
 
+class MinimalisticObserver < ActiveRecord::Observer
+  attr_reader :minimalistic
+
+  def after_find(minimalistic)
+    @minimalistic = minimalistic
+  end
+end
+
 class MultiObserver < ActiveRecord::Observer
   attr_reader :record
 
@@ -65,7 +74,7 @@ class MultiObserver < ActiveRecord::Observer
 end
 
 class LifecycleTest < ActiveRecord::TestCase
-  fixtures :topics, :developers
+  fixtures :topics, :developers, :minimalistics
 
   def test_before_destroy
     original_count = Topic.count
@@ -134,6 +143,50 @@ class LifecycleTest < ActiveRecord::TestCase
     assert_equal developer.name, multi_observer.record.name
   end
 
+  def test_after_find_can_be_observed_when_its_not_defined_on_the_model
+    observer = MinimalisticObserver.instance
+    assert_equal Minimalistic, MinimalisticObserver.observed_class
+
+    minimalistic = Minimalistic.find(1)
+    assert_equal minimalistic, observer.minimalistic
+  end
+
+  def test_after_find_can_be_observed_when_its_defined_on_the_model
+    observer = TopicObserver.instance
+    assert_equal Topic, TopicObserver.observed_class
+
+    topic = Topic.find(1)
+    assert_equal topic, observer.topic
+  end
+
+  def test_after_find_is_not_created_if_its_not_used
+    # use a fresh class so an observer can't have defined an
+    # after_find on it
+    model_class = Class.new(ActiveRecord::Base)
+    observer_class = Class.new(ActiveRecord::Observer)
+    observer_class.observe(model_class)
+
+    observer = observer_class.instance
+
+    assert !model_class.method_defined?(:after_find)
+  end
+
+  def test_after_find_is_not_clobbered_if_it_already_exists
+    # use a fresh observer class so we can instantiate it (Observer is
+    # a Singleton)
+    model_class = Class.new(ActiveRecord::Base) do
+      def after_find; end
+    end
+    original_method = model_class.instance_method(:after_find)
+    observer_class = Class.new(ActiveRecord::Observer) do
+      def after_find; end
+    end
+    observer_class.observe(model_class)
+
+    observer = observer_class.instance
+    assert_equal original_method, model_class.instance_method(:after_find)
+  end
+
   def test_invalid_observer
     assert_raise(ArgumentError) { Topic.observers = Object.new; Topic.instantiate_observers }
   end
diff --git a/vendor/rails/activerecord/test/cases/locking_test.rb b/vendor/rails/activerecord/test/cases/locking_test.rb
index 7db6c570..70118722 100644
--- a/vendor/rails/activerecord/test/cases/locking_test.rb
+++ b/vendor/rails/activerecord/test/cases/locking_test.rb
@@ -29,10 +29,12 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 0, p1.lock_version
     assert_equal 0, p2.lock_version
 
+    p1.first_name = 'stu'
     p1.save!
     assert_equal 1, p1.lock_version
     assert_equal 0, p2.lock_version
 
+    p2.first_name = 'sue'
     assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
   end
 
@@ -42,11 +44,14 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 0, p1.lock_version
     assert_equal 0, p2.lock_version
 
+    p1.first_name = 'stu'
     p1.save!
     assert_equal 1, p1.lock_version
     assert_equal 0, p2.lock_version
 
+    p2.first_name = 'sue'
     assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
+    p2.first_name = 'sue2'
     assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
   end
 
@@ -54,15 +59,18 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     p1 = Person.new(:first_name => 'anika')
     assert_equal 0, p1.lock_version
 
+    p1.first_name = 'anika2'
     p1.save!
     p2 = Person.find(p1.id)
     assert_equal 0, p1.lock_version
     assert_equal 0, p2.lock_version
 
+    p1.first_name = 'anika3'
     p1.save!
     assert_equal 1, p1.lock_version
     assert_equal 0, p2.lock_version
 
+    p2.first_name = 'sue'
     assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
   end
 
@@ -81,10 +89,12 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 0, t1.version
     assert_equal 0, t2.version
 
+    t1.tps_report_number = 700
     t1.save!
     assert_equal 1, t1.version
     assert_equal 0, t2.version
 
+    t2.tps_report_number = 800
     assert_raises(ActiveRecord::StaleObjectError) { t2.save! }
   end
 
@@ -93,6 +103,7 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 0, p1.lock_version
     assert_equal p1.lock_version, Person.new(p1.attributes).lock_version
 
+    p1.first_name = 'bianca2'
     p1.save!
     assert_equal 1, p1.lock_version
     assert_equal p1.lock_version, Person.new(p1.attributes).lock_version
@@ -146,6 +157,15 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert ref.save
   end
 
+  # Useful for partial updates, don't only update the lock_version if there
+  # is nothing else being updated.
+  def test_update_without_attributes_does_not_only_update_lock_version
+    assert_nothing_raised do
+      p1 = Person.new(:first_name => 'anika')
+      p1.send(:update_with_lock, [])
+    end
+  end
+
   private
 
     def add_counter_column_to(model)
diff --git a/vendor/rails/activerecord/test/cases/method_scoping_test.rb b/vendor/rails/activerecord/test/cases/method_scoping_test.rb
index 1a9a8757..ee66ac94 100644
--- a/vendor/rails/activerecord/test/cases/method_scoping_test.rb
+++ b/vendor/rails/activerecord/test/cases/method_scoping_test.rb
@@ -6,7 +6,7 @@ require 'models/post'
 require 'models/category'
 
 class MethodScopingTest < ActiveRecord::TestCase
-  fixtures :developers, :projects, :comments, :posts
+  fixtures :developers, :projects, :comments, :posts, :developers_projects
 
   def test_set_conditions
     Developer.with_scope(:find => { :conditions => 'just a test...' }) do
@@ -87,6 +87,16 @@ class MethodScopingTest < ActiveRecord::TestCase
     assert_equal 1, scoped_developers.size
   end
 
+  def test_scoped_find_joins
+    scoped_developers = Developer.with_scope(:find => { :joins => 'JOIN developers_projects ON id = developer_id' } ) do
+      Developer.find(:all, :conditions => 'developers_projects.project_id = 2')
+    end
+    assert scoped_developers.include?(developers(:david))
+    assert !scoped_developers.include?(developers(:jamis))
+    assert_equal 1, scoped_developers.size
+    assert_equal developers(:david).attributes, scoped_developers.first.attributes
+  end
+
   def test_scoped_count_include
     # with the include, will retrieve only developers for the given project
     Developer.with_scope(:find => { :include => :projects }) do
diff --git a/vendor/rails/activerecord/test/cases/migration_test.rb b/vendor/rails/activerecord/test/cases/migration_test.rb
index f36255e2..a9880a9a 100644
--- a/vendor/rails/activerecord/test/cases/migration_test.rb
+++ b/vendor/rails/activerecord/test/cases/migration_test.rb
@@ -3,6 +3,7 @@ require 'bigdecimal/util'
 
 require 'models/person'
 require 'models/topic'
+require 'models/developer'
 
 require MIGRATIONS_ROOT + "/valid/1_people_have_last_names"
 require MIGRATIONS_ROOT + "/valid/2_we_need_reminders"
@@ -153,9 +154,10 @@ if ActiveRecord::Base.connection.supports_migrations?
 
           t.column :default_int, :integer
 
-          t.column :one_int,   :integer, :limit => 1
-          t.column :four_int,  :integer, :limit => 4
-          t.column :eight_int, :integer, :limit => 8
+          t.column :one_int,    :integer, :limit => 1
+          t.column :four_int,   :integer, :limit => 4
+          t.column :eight_int,  :integer, :limit => 8
+          t.column :eleven_int, :integer, :limit => 11
         end
       end
 
@@ -167,12 +169,20 @@ if ActiveRecord::Base.connection.supports_migrations?
       one     = columns.detect { |c| c.name == "one_int"     }
       four    = columns.detect { |c| c.name == "four_int"    }
       eight   = columns.detect { |c| c.name == "eight_int"   }
+      eleven  = columns.detect { |c| c.name == "eleven_int"   }
 
       if current_adapter?(:PostgreSQLAdapter)
         assert_equal 'integer', default.sql_type
         assert_equal 'smallint', one.sql_type
         assert_equal 'integer', four.sql_type
         assert_equal 'bigint', eight.sql_type
+        assert_equal 'integer', eleven.sql_type
+      elsif current_adapter?(:MysqlAdapter)
+        assert_match 'int(11)', default.sql_type
+        assert_match 'tinyint', one.sql_type
+        assert_match 'int', four.sql_type
+        assert_match 'bigint', eight.sql_type
+        assert_match 'int(11)', eleven.sql_type
       elsif current_adapter?(:OracleAdapter)
         assert_equal 'NUMBER(38)', default.sql_type
         assert_equal 'NUMBER(1)', one.sql_type
@@ -227,6 +237,39 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    def test_create_table_with_timestamps_should_create_datetime_columns
+      table_name = :testings
+
+      Person.connection.create_table table_name do |t|
+        t.timestamps
+      end
+      created_columns = Person.connection.columns(table_name)
+
+      created_at_column = created_columns.detect {|c| c.name == 'created_at' }
+      updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
+
+      assert created_at_column.null
+      assert updated_at_column.null
+    ensure
+      Person.connection.drop_table table_name rescue nil
+    end
+
+    def test_create_table_with_timestamps_should_create_datetime_columns_with_options
+      table_name = :testings
+
+      Person.connection.create_table table_name do |t|
+        t.timestamps :null => false
+      end
+      created_columns = Person.connection.columns(table_name)
+
+      created_at_column = created_columns.detect {|c| c.name == 'created_at' }
+      updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
+
+      assert !created_at_column.null
+      assert !updated_at_column.null
+    ensure
+      Person.connection.drop_table table_name rescue nil
+    end
 
     # SQL Server, Sybase, and SQLite3 will not allow you to add a NOT NULL
     # column to a table without a default value.
@@ -399,10 +442,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
         ActiveRecord::Migration.add_column :people, :intelligence_quotient, :tinyint
         Person.reset_column_information
-        Person.create :intelligence_quotient => 300
-        jonnyg = Person.find(:first)
-        assert_equal 127, jonnyg.intelligence_quotient
-        jonnyg.destroy
+        assert_match /tinyint/, Person.columns_hash['intelligence_quotient'].sql_type
       ensure
         ActiveRecord::Migration.remove_column :people, :intelligence_quotient rescue nil
       end
@@ -483,6 +523,37 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    def test_rename_column_preserves_default_value_not_null
+      begin
+        default_before = Developer.connection.columns("developers").find { |c| c.name == "salary" }.default
+        assert_equal 70000, default_before
+        Developer.connection.rename_column "developers", "salary", "anual_salary"
+        Developer.reset_column_information
+        assert Developer.column_names.include?("anual_salary")
+        default_after = Developer.connection.columns("developers").find { |c| c.name == "anual_salary" }.default
+        assert_equal 70000, default_after
+      ensure
+        Developer.connection.rename_column "developers", "anual_salary", "salary"
+        Developer.reset_column_information
+      end
+    end
+
+    def test_rename_nonexistent_column
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :default => nil
+      end
+      exception = if current_adapter?(:PostgreSQLAdapter)
+        ActiveRecord::StatementInvalid
+      else
+        ActiveRecord::ActiveRecordError
+      end
+      assert_raises(exception) do
+        Person.connection.rename_column "hats", "nonexistent", "should_fail"
+      end
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
     def test_rename_column_with_sql_reserved_word
       begin
         assert_nothing_raised { Person.connection.rename_column "people", "first_name", "group" }
@@ -662,6 +733,55 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.drop_table :testings rescue nil
     end
 
+    def test_keeping_default_and_notnull_constaint_on_change
+      Person.connection.create_table :testings do |t|
+        t.column :title, :string
+      end
+      person_klass = Class.new(Person)
+      person_klass.set_table_name 'testings'
+
+      person_klass.connection.add_column "testings", "wealth", :integer, :null => false, :default => 99
+      person_klass.reset_column_information
+      assert_equal 99, person_klass.columns_hash["wealth"].default
+      assert_equal false, person_klass.columns_hash["wealth"].null
+      assert_nothing_raised {person_klass.connection.execute("insert into testings (title) values ('tester')")}
+
+      # change column default to see that column doesn't lose its not null definition
+      person_klass.connection.change_column_default "testings", "wealth", 100
+      person_klass.reset_column_information
+      assert_equal 100, person_klass.columns_hash["wealth"].default
+      assert_equal false, person_klass.columns_hash["wealth"].null
+
+      # rename column to see that column doesn't lose its not null and/or default definition
+      person_klass.connection.rename_column "testings", "wealth", "money"
+      person_klass.reset_column_information
+      assert_nil person_klass.columns_hash["wealth"]
+      assert_equal 100, person_klass.columns_hash["money"].default
+      assert_equal false, person_klass.columns_hash["money"].null
+
+      # change column
+      person_klass.connection.change_column "testings", "money", :integer, :null => false, :default => 1000
+      person_klass.reset_column_information
+      assert_equal 1000, person_klass.columns_hash["money"].default
+      assert_equal false, person_klass.columns_hash["money"].null
+
+      # change column, make it nullable and clear default
+      person_klass.connection.change_column "testings", "money", :integer, :null => true, :default => nil
+      person_klass.reset_column_information
+      assert_nil person_klass.columns_hash["money"].default
+      assert_equal true, person_klass.columns_hash["money"].null
+
+      # change_column_null, make it not nullable and set null values to a default value
+      person_klass.connection.execute('UPDATE testings SET money = NULL')
+      person_klass.connection.change_column_null "testings", "money", false, 2000
+      person_klass.reset_column_information
+      assert_nil person_klass.columns_hash["money"].default
+      assert_equal false, person_klass.columns_hash["money"].null
+      assert_equal [2000], Person.connection.select_values("SELECT money FROM testings").map { |s| s.to_i }.sort
+    ensure
+      Person.connection.drop_table :testings rescue nil
+    end
+
     def test_change_column_default_to_null
       Person.connection.change_column_default "people", "first_name", nil
       Person.reset_column_information
@@ -799,6 +919,21 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert !Reminder.table_exists?
     end
 
+    def test_migrator_double_up
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1)
+      assert_nothing_raised { ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1) }
+      assert_equal(1, ActiveRecord::Migrator.current_version)
+    end
+
+    def test_migrator_double_down
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1)
+      ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 1)
+      assert_nothing_raised { ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 1) }
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+    end
+
     def test_finds_migrations
       migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").migrations
       [['1', 'people_have_last_names'],
@@ -888,16 +1023,6 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
       assert_equal(0, ActiveRecord::Migrator.current_version)
     end
-    
-    def test_migrator_run
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 3)
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-      ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 3)
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-    end
 
     def test_schema_migrations_table_name
       ActiveRecord::Base.table_name_prefix = "prefix_"
@@ -1077,8 +1202,8 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       def test_timestamps_creates_updated_at_and_created_at
         with_new_table do |t|
-          t.expects(:column).with(:created_at, :datetime)
-          t.expects(:column).with(:updated_at, :datetime)
+          t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
+          t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
           t.timestamps
         end
       end
@@ -1206,10 +1331,10 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
 
       def integer_column
-        if current_adapter?(:SQLite3Adapter) || current_adapter?(:SQLiteAdapter) || current_adapter?(:PostgreSQLAdapter)
-          "integer"
-        else
+        if current_adapter?(:MysqlAdapter)
           'int(11)'
+        else
+          'integer'
         end
       end
 
diff --git a/vendor/rails/activerecord/test/cases/multiple_db_test.rb b/vendor/rails/activerecord/test/cases/multiple_db_test.rb
index 236e4710..eb3e43c8 100644
--- a/vendor/rails/activerecord/test/cases/multiple_db_test.rb
+++ b/vendor/rails/activerecord/test/cases/multiple_db_test.rb
@@ -51,7 +51,7 @@ class MultipleDbTest < ActiveRecord::TestCase
   def test_course_connection_should_survive_dependency_reload
     assert Course.connection
 
-    Dependencies.clear
+    ActiveSupport::Dependencies.clear
     Object.send(:remove_const, :Course)
     require_dependency 'models/course'
 
diff --git a/vendor/rails/activerecord/test/cases/named_scope_test.rb b/vendor/rails/activerecord/test/cases/named_scope_test.rb
index d890cf79..be6551c6 100644
--- a/vendor/rails/activerecord/test/cases/named_scope_test.rb
+++ b/vendor/rails/activerecord/test/cases/named_scope_test.rb
@@ -4,9 +4,10 @@ require 'models/topic'
 require 'models/comment'
 require 'models/reply'
 require 'models/author'
+require 'models/developer'
 
 class NamedScopeTest < ActiveRecord::TestCase
-  fixtures :posts, :authors, :topics, :comments
+  fixtures :posts, :authors, :topics, :comments, :author_addresses
 
   def test_implements_enumerable
     assert !Topic.find(:all).empty?
@@ -45,6 +46,17 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal Topic.average(:replies_count), Topic.base.average(:replies_count)
   end
 
+  def test_scope_should_respond_to_own_methods_and_methods_of_the_proxy
+    assert Topic.approved.respond_to?(:proxy_found)
+    assert Topic.approved.respond_to?(:count)
+    assert Topic.approved.respond_to?(:length)
+  end
+
+  def test_respond_to_respects_include_private_parameter
+    assert !Topic.approved.respond_to?(:load_found)
+    assert Topic.approved.respond_to?(:load_found, true)
+  end
+
   def test_subclasses_inherit_scopes
     assert Topic.scopes.include?(:base)
 
@@ -59,6 +71,12 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal Topic.count(:conditions => {:approved => true}), Topic.approved.count
   end
 
+  def test_scopes_with_string_name_can_be_composed
+    # NOTE that scopes defined with a string as a name worked on their own
+    # but when called on another scope the other scope was completely replaced
+    assert_equal Topic.replied.approved, Topic.replied.approved_as_string
+  end
+
   def test_scopes_are_composable
     assert_equal (approved = Topic.find(:all, :conditions => {:approved => true})), Topic.approved
     assert_equal (replied = Topic.find(:all, :conditions => 'replies_count > 0')), Topic.replied
@@ -77,6 +95,25 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal topics_written_before_the_second, Topic.written_before(topics(:second).written_on)
   end
 
+  def test_scopes_with_joins
+    address = author_addresses(:david_address)
+    posts_with_authors_at_address = Post.find(
+      :all, :joins => 'JOIN authors ON authors.id = posts.author_id',
+      :conditions => [ 'authors.author_address_id = ?', address.id ]
+    )
+    assert_equal posts_with_authors_at_address, Post.with_authors_at_address(address)
+  end
+
+  def test_scopes_with_joins_respects_custom_select
+    address = author_addresses(:david_address)
+    posts_with_authors_at_address_titles = Post.find(:all,
+      :select => 'title',
+      :joins => 'JOIN authors ON authors.id = posts.author_id',
+      :conditions => [ 'authors.author_address_id = ?', address.id ]
+    )
+    assert_equal posts_with_authors_at_address_titles, Post.with_authors_at_address(address).find(:all, :select => 'title')
+  end
+
   def test_extensions
     assert_equal 1, Topic.anonymous_extension.one
     assert_equal 2, Topic.named_extension.two
@@ -154,4 +191,16 @@ class NamedScopeTest < ActiveRecord::TestCase
       topics.empty?  # use loaded (no query)
     end
   end
+
+  def test_find_all_should_behave_like_select
+    assert_equal Topic.base.select(&:approved), Topic.base.find_all(&:approved)
+  end
+
+  def test_rand_should_select_a_random_object_from_proxy
+    assert Topic.approved.rand.is_a?(Topic)
+  end
+
+  def test_should_use_where_in_query_for_named_scope
+    assert_equal Developer.find_all_by_name('Jamis'), Developer.find_all_by_id(Developer.jamises)
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/query_cache_test.rb b/vendor/rails/activerecord/test/cases/query_cache_test.rb
index dc9eeec2..171d0e6d 100644
--- a/vendor/rails/activerecord/test/cases/query_cache_test.rb
+++ b/vendor/rails/activerecord/test/cases/query_cache_test.rb
@@ -58,7 +58,7 @@ end
 uses_mocha 'QueryCacheExpiryTest' do
 
 class QueryCacheExpiryTest < ActiveRecord::TestCase
-  fixtures :tasks
+  fixtures :tasks, :posts, :categories, :categories_posts
 
   def test_find
     Task.connection.expects(:clear_query_cache).times(1)
@@ -116,8 +116,9 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
   def test_cache_is_expired_by_habtm_delete
     ActiveRecord::Base.connection.expects(:clear_query_cache).times(2)
     ActiveRecord::Base.cache do
-      c = Category.find(:first)
-      p = Post.find(:first)
+      c = Category.find(1)
+      p = Post.find(1)
+      assert p.categories.any?
       p.categories.delete_all
     end
   end
diff --git a/vendor/rails/activerecord/test/cases/reflection_test.rb b/vendor/rails/activerecord/test/cases/reflection_test.rb
index 8b4d2325..0c57b794 100644
--- a/vendor/rails/activerecord/test/cases/reflection_test.rb
+++ b/vendor/rails/activerecord/test/cases/reflection_test.rb
@@ -160,9 +160,9 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_reflection_of_all_associations
     # FIXME these assertions bust a lot
-    assert_equal 20, Firm.reflect_on_all_associations.size
-    assert_equal 16, Firm.reflect_on_all_associations(:has_many).size
-    assert_equal 4, Firm.reflect_on_all_associations(:has_one).size
+    assert_equal 22, Firm.reflect_on_all_associations.size
+    assert_equal 17, Firm.reflect_on_all_associations(:has_many).size
+    assert_equal 5, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end
 
diff --git a/vendor/rails/activerecord/test/cases/schema_dumper_test.rb b/vendor/rails/activerecord/test/cases/schema_dumper_test.rb
index c42b0efb..ee7e285a 100644
--- a/vendor/rails/activerecord/test/cases/schema_dumper_test.rb
+++ b/vendor/rails/activerecord/test/cases/schema_dumper_test.rb
@@ -72,6 +72,52 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_match %r{:null => false}, output
   end
 
+  def test_schema_dump_includes_limit_constraint_for_integer_columns
+    stream = StringIO.new
+
+    ActiveRecord::SchemaDumper.ignore_tables = [/^(?!integer_limits)/]
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    output = stream.string
+
+    if current_adapter?(:PostgreSQLAdapter)
+      assert_match %r{c_int_1.*:limit => 2}, output
+      assert_match %r{c_int_2.*:limit => 2}, output
+
+      # int 3 is 4 bytes in postgresql
+      assert_match %r{c_int_3.*}, output
+      assert_no_match %r{c_int_3.*:limit}, output
+
+      assert_match %r{c_int_4.*}, output
+      assert_no_match %r{c_int_4.*:limit}, output
+    elsif current_adapter?(:MysqlAdapter)
+      assert_match %r{c_int_1.*:limit => 1}, output
+      assert_match %r{c_int_2.*:limit => 2}, output
+      assert_match %r{c_int_3.*:limit => 3}, output
+
+      assert_match %r{c_int_4.*}, output
+      assert_no_match %r{c_int_4.*:limit}, output
+    elsif current_adapter?(:SQLiteAdapter)
+      assert_match %r{c_int_1.*:limit => 1}, output
+      assert_match %r{c_int_2.*:limit => 2}, output
+      assert_match %r{c_int_3.*:limit => 3}, output
+      assert_match %r{c_int_4.*:limit => 4}, output
+    end
+    assert_match %r{c_int_without_limit.*}, output
+    assert_no_match %r{c_int_without_limit.*:limit}, output
+
+    if current_adapter?(:SQLiteAdapter)
+      assert_match %r{c_int_5.*:limit => 5}, output
+      assert_match %r{c_int_6.*:limit => 6}, output
+      assert_match %r{c_int_7.*:limit => 7}, output
+      assert_match %r{c_int_8.*:limit => 8}, output
+    else
+      assert_match %r{c_int_5.*:limit => 8}, output
+      assert_match %r{c_int_6.*:limit => 8}, output
+      assert_match %r{c_int_7.*:limit => 8}, output
+      assert_match %r{c_int_8.*:limit => 8}, output
+    end
+  end
+
   def test_schema_dump_with_string_ignored_table
     stream = StringIO.new
 
diff --git a/vendor/rails/activerecord/test/cases/validations_test.rb b/vendor/rails/activerecord/test/cases/validations_test.rb
index 7b71647d..91a09875 100755
--- a/vendor/rails/activerecord/test/cases/validations_test.rb
+++ b/vendor/rails/activerecord/test/cases/validations_test.rb
@@ -451,6 +451,18 @@ class ValidationsTest < ActiveRecord::TestCase
     t2.title = nil
     assert t2.valid?, "should validate with nil"
     assert t2.save, "should save with nil"
+
+    with_kcode('UTF8') do
+      t_utf8 = Topic.new("title" => "Я тоже уникальный!")
+      assert t_utf8.save, "Should save t_utf8 as unique"
+
+      # If database hasn't UTF-8 character set, this test fails
+      if Topic.find(t_utf8, :select => 'LOWER(title) AS title').title == "я тоже уникальный!"
+        t2_utf8 = Topic.new("title" => "я тоже УНИКАЛЬНЫЙ!")
+        assert !t2_utf8.valid?, "Shouldn't be valid"
+        assert !t2_utf8.save, "Shouldn't save t2_utf8 as unique"
+      end
+    end
   end
 
   def test_validate_case_sensitive_uniqueness
@@ -1059,6 +1071,18 @@ class ValidationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_validates_length_of_with_block
+    Topic.validates_length_of :content, :minimum => 5, :too_short=>"Your essay must be at least %d words.", 
+                                        :tokenizer => lambda {|str| str.scan(/\w+/) }
+    t = Topic.create!(:content => "this content should be long enough")
+    assert t.valid?
+
+    t.content = "not long enough"
+    assert !t.valid?
+    assert t.errors.on(:content)
+    assert_equal "Your essay must be at least 5 words.", t.errors[:content]
+  end
+
   def test_validates_size_of_association_utf8
     with_kcode('UTF8') do
       assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
@@ -1379,6 +1403,7 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   INTEGERS = [0, 10, -10] + INTEGER_STRINGS
   BIGDECIMAL = BIGDECIMAL_STRINGS.collect! { |bd| BigDecimal.new(bd) }
   JUNK = ["not a number", "42 not a number", "0xdeadbeef", "00-1", "--3", "+-3", "+3-1", "-+019.0", "12.12.13.12", "123\nnot a number"]
+  INFINITY = [1.0/0.0]
 
   def setup
     Topic.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
@@ -1390,27 +1415,27 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
     Topic.validates_numericality_of :approved
 
     invalid!(NIL + BLANK + JUNK)
-    valid!(FLOATS + INTEGERS + BIGDECIMAL)
+    valid!(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
   end
 
   def test_validates_numericality_of_with_nil_allowed
     Topic.validates_numericality_of :approved, :allow_nil => true
 
     invalid!(BLANK + JUNK)
-    valid!(NIL + FLOATS + INTEGERS + BIGDECIMAL)
+    valid!(NIL + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
   end
 
   def test_validates_numericality_of_with_integer_only
     Topic.validates_numericality_of :approved, :only_integer => true
 
-    invalid!(NIL + BLANK + JUNK + FLOATS + BIGDECIMAL)
+    invalid!(NIL + BLANK + JUNK + FLOATS + BIGDECIMAL + INFINITY)
     valid!(INTEGERS)
   end
 
   def test_validates_numericality_of_with_integer_only_and_nil_allowed
     Topic.validates_numericality_of :approved, :only_integer => true, :allow_nil => true
 
-    invalid!(BLANK + JUNK + FLOATS + BIGDECIMAL)
+    invalid!(BLANK + JUNK + FLOATS + BIGDECIMAL + INFINITY)
     valid!(NIL + INTEGERS)
   end
 
@@ -1431,7 +1456,7 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   def test_validates_numericality_with_equal_to
     Topic.validates_numericality_of :approved, :equal_to => 10
 
-    invalid!([-10, 11], 'must be equal to 10')
+    invalid!([-10, 11] + INFINITY, 'must be equal to 10')
     valid!([10])
   end
 
diff --git a/vendor/rails/activerecord/test/models/author.rb b/vendor/rails/activerecord/test/models/author.rb
index f63af274..24e3de34 100644
--- a/vendor/rails/activerecord/test/models/author.rb
+++ b/vendor/rails/activerecord/test/models/author.rb
@@ -1,6 +1,7 @@
 class Author < ActiveRecord::Base
   has_many :posts
   has_many :posts_with_comments, :include => :comments, :class_name => "Post"
+  has_many :posts_with_comments_sorted_by_comment_id, :include => :comments, :class_name => "Post", :order => 'comments.id'
   has_many :posts_with_categories, :include => :categories, :class_name => "Post"
   has_many :posts_with_comments_and_categories, :include => [ :comments, :categories ], :order => "posts.id", :class_name => "Post"
   has_many :posts_containing_the_letter_a, :class_name => "Post"
@@ -31,6 +32,9 @@ class Author < ActiveRecord::Base
   has_many :special_posts
   has_many :special_post_comments, :through => :special_posts, :source => :comments
 
+  has_many :sti_posts, :class_name => 'StiPost'
+  has_many :sti_post_comments, :through => :sti_posts, :source => :comments
+
   has_many :special_nonexistant_posts, :class_name => "SpecialPost", :conditions => "posts.body = 'nonexistant'"
   has_many :special_nonexistant_post_comments, :through => :special_nonexistant_posts, :source => :comments, :conditions => "comments.post_id = 0"
   has_many :nonexistant_comments, :through => :posts
diff --git a/vendor/rails/activerecord/test/models/category.rb b/vendor/rails/activerecord/test/models/category.rb
index f1d2e480..1660c616 100644
--- a/vendor/rails/activerecord/test/models/category.rb
+++ b/vendor/rails/activerecord/test/models/category.rb
@@ -2,6 +2,7 @@ class Category < ActiveRecord::Base
   has_and_belongs_to_many :posts
   has_and_belongs_to_many :special_posts, :class_name => "Post"
   has_and_belongs_to_many :other_posts, :class_name => "Post"
+  has_and_belongs_to_many :posts_with_authors_sorted_by_author_id, :class_name => "Post", :include => :authors, :order => "authors.id"
 
   has_and_belongs_to_many(:select_testing_posts,
                           :class_name => 'Post',
diff --git a/vendor/rails/activerecord/test/models/company.rb b/vendor/rails/activerecord/test/models/company.rb
index 70f83fa8..408b5e3a 100755
--- a/vendor/rails/activerecord/test/models/company.rb
+++ b/vendor/rails/activerecord/test/models/company.rb
@@ -18,6 +18,13 @@ end
 module Namespaced
   class Company < ::Company
   end
+
+  class Firm < ::Company
+    has_many :clients, :class_name => 'Namespaced::Client'
+  end
+
+  class Client < ::Company
+  end
 end
 
 class Firm < Company
@@ -26,6 +33,7 @@ class Firm < Company
       "AND (#{QUOTED_TYPE} = 'Client' OR #{QUOTED_TYPE} = 'SpecialClient' OR #{QUOTED_TYPE} = 'VerySpecialClient' )"
   has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
   has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
+  has_many :unvalidated_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :validate => false
   has_many :dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :destroy
   has_many :exclusively_dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all
   has_many :limited_clients, :class_name => "Client", :order => "id", :limit => 1
@@ -46,7 +54,8 @@ class Firm < Company
   has_many :plain_clients, :class_name => 'Client'
   has_many :readonly_clients, :class_name => 'Client', :readonly => true
 
-  has_one :account, :foreign_key => "firm_id", :dependent => :destroy
+  has_one :account, :foreign_key => "firm_id", :dependent => :destroy, :validate => true
+  has_one :unvalidated_account, :foreign_key => "firm_id", :class_name => 'Account', :validate => false
   has_one :account_with_select, :foreign_key => "firm_id", :select => "id, firm_id", :class_name=>'Account'
   has_one :readonly_account, :foreign_key => "firm_id", :class_name => "Account", :readonly => true
 end
diff --git a/vendor/rails/activerecord/test/models/developer.rb b/vendor/rails/activerecord/test/models/developer.rb
index f77fd0e9..c08476f7 100644
--- a/vendor/rails/activerecord/test/models/developer.rb
+++ b/vendor/rails/activerecord/test/models/developer.rb
@@ -43,6 +43,8 @@ class Developer < ActiveRecord::Base
 
   has_many :audit_logs
 
+  named_scope :jamises, :conditions => {:name => 'Jamis'}
+
   validates_inclusion_of :salary, :in => 50000..200000
   validates_length_of    :name, :within => 3..20
 
@@ -56,7 +58,8 @@ class Developer < ActiveRecord::Base
 end
 
 class AuditLog < ActiveRecord::Base
-  belongs_to :developer
+  belongs_to :developer, :validate => true
+  belongs_to :unvalidated_developer, :class_name => 'Developer'
 end
 
 DeveloperSalary = Struct.new(:amount)
diff --git a/vendor/rails/activerecord/test/models/person.rb b/vendor/rails/activerecord/test/models/person.rb
index 4f4d695b..430d0b38 100644
--- a/vendor/rails/activerecord/test/models/person.rb
+++ b/vendor/rails/activerecord/test/models/person.rb
@@ -6,5 +6,5 @@ class Person < ActiveRecord::Base
   has_many :references
   has_many :jobs, :through => :references
   has_one :favourite_reference, :class_name => 'Reference', :conditions => ['favourite=?', true]
-
+  has_many :posts_with_comments_sorted_by_comment_id, :through => :readers, :source => :post, :include => :comments, :order => 'comments.id'
 end
diff --git a/vendor/rails/activerecord/test/models/post.rb b/vendor/rails/activerecord/test/models/post.rb
index d9101706..3adbc0ce 100644
--- a/vendor/rails/activerecord/test/models/post.rb
+++ b/vendor/rails/activerecord/test/models/post.rb
@@ -1,6 +1,11 @@
 class Post < ActiveRecord::Base
   named_scope :containing_the_letter_a, :conditions => "body LIKE '%a%'"
-  
+  named_scope :with_authors_at_address, lambda { |address| {
+      :conditions => [ 'authors.author_address_id = ?', address.id ],
+      :joins => 'JOIN authors ON authors.id = posts.author_id'
+    }
+  }
+
   belongs_to :author do
     def greeting
       "hello"
diff --git a/vendor/rails/activerecord/test/models/project.rb b/vendor/rails/activerecord/test/models/project.rb
index e1ab89ec..44c692b5 100644
--- a/vendor/rails/activerecord/test/models/project.rb
+++ b/vendor/rails/activerecord/test/models/project.rb
@@ -7,7 +7,7 @@ class Project < ActiveRecord::Base
   has_and_belongs_to_many :developers_named_david, :class_name => "Developer", :conditions => "name = 'David'", :uniq => true
   has_and_belongs_to_many :developers_named_david_with_hash_conditions, :class_name => "Developer", :conditions => { :name => 'David' }, :uniq => true
   has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
-  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id}'
+  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id'
   has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => "DELETE FROM developers_projects WHERE project_id = \#{id} AND developer_id = \#{record.id}"
   has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id || '<new>'}"},
                             :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"},
diff --git a/vendor/rails/activerecord/test/models/topic.rb b/vendor/rails/activerecord/test/models/topic.rb
index f63e862c..423b6fe5 100755
--- a/vendor/rails/activerecord/test/models/topic.rb
+++ b/vendor/rails/activerecord/test/models/topic.rb
@@ -4,6 +4,7 @@ class Topic < ActiveRecord::Base
     { :conditions => ['written_on < ?', time] }
   }
   named_scope :approved, :conditions => {:approved => true}
+  named_scope 'approved_as_string', :conditions => {:approved => true}
   named_scope :replied, :conditions => ['replies_count > 0']
   named_scope :anonymous_extension do
     def one
diff --git a/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb b/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb
index 5ae062c9..f44c33ae 100644
--- a/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb
+++ b/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb
@@ -1,5 +1,5 @@
 ActiveRecord::Schema.define do
-  create_table :binary_fields, :force => true do |t|
+  create_table :binary_fields, :force => true, :options => 'CHARACTER SET latin1' do |t|
     t.binary :tiny_blob,   :limit => 255
     t.binary :normal_blob, :limit => 65535
     t.binary :medium_blob, :limit => 16777215
@@ -9,4 +9,4 @@ ActiveRecord::Schema.define do
     t.text   :medium_text, :limit => 16777215
     t.text   :long_text,   :limit => 2147483647
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activerecord/test/schema/schema.rb b/vendor/rails/activerecord/test/schema/schema.rb
index 423929fd..0515df79 100644
--- a/vendor/rails/activerecord/test/schema/schema.rb
+++ b/vendor/rails/activerecord/test/schema/schema.rb
@@ -66,6 +66,7 @@ ActiveRecord::Schema.define do
   create_table :categories, :force => true do |t|
     t.string :name, :null => false
     t.string :type
+    t.integer :categorizations_count
   end
 
   create_table :categories_posts, :force => true, :id => false do |t|
@@ -407,6 +408,13 @@ ActiveRecord::Schema.define do
     t.column :key, :string
   end
 
+  create_table :integer_limits, :force => true do |t|
+    t.integer :"c_int_without_limit"
+    (1..8).each do |i|
+      t.integer :"c_int_#{i}", :limit => i
+    end
+  end
+
   except 'SQLite' do
     # fk_test_has_fk should be before fk_test_has_pk
     create_table :fk_test_has_fk, :force => true do |t|
diff --git a/vendor/rails/activeresource/CHANGELOG b/vendor/rails/activeresource/CHANGELOG
index e124e40d..903f5c20 100644
--- a/vendor/rails/activeresource/CHANGELOG
+++ b/vendor/rails/activeresource/CHANGELOG
@@ -1,3 +1,8 @@
+*2.1.1 (September 4th, 2008)*
+
+* Fixed Base#exists? to check status code as integer [#299 state:resolved] (Wes Oldenbeuving)
+
+
 *2.1.0 (May 31st, 2008)*
 
 * Fixed response logging to use length instead of the entire thing (seangeo) [#27]
diff --git a/vendor/rails/activeresource/Rakefile b/vendor/rails/activeresource/Rakefile
index 9fd0ec49..45c2208d 100644
--- a/vendor/rails/activeresource/Rakefile
+++ b/vendor/rails/activeresource/Rakefile
@@ -5,6 +5,7 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
+require 'rake/contrib/rubyforgepublisher'
 
 require File.join(File.dirname(__FILE__), 'lib', 'active_resource', 'version')
 
@@ -42,9 +43,10 @@ Rake::RDocTask.new { |rdoc|
   rdoc.title    = "Active Resource -- Object-oriented REST services"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
   rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.exclude('lib/activeresource.rb')
 }
 
 
@@ -64,7 +66,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.1.1' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'active_resource'
@@ -114,13 +116,13 @@ end
 
 desc "Publish the beta gem"
 task :pgem => [:package] do 
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
+  Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/ar", "doc").upload
+  Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ar", "doc").upload
 end
 
 desc "Publish the release files to RubyForge."
diff --git a/vendor/rails/activeresource/lib/active_resource/base.rb b/vendor/rails/activeresource/lib/active_resource/base.rb
index 463ee9f1..17fbb4b6 100644
--- a/vendor/rails/activeresource/lib/active_resource/base.rb
+++ b/vendor/rails/activeresource/lib/active_resource/base.rb
@@ -356,6 +356,9 @@ module ActiveResource
         # Replace :placeholders with '#{embedded options[:lookups]}'
         prefix_call = value.gsub(/:\w+/) { |key| "\#{options[#{key}]}" }
 
+        # Clear prefix parameters in case they have been cached
+        @prefix_parameters = nil
+
         # Redefine the new methods.
         code = <<-end_code
           def prefix_source() "#{value}" end
@@ -538,7 +541,7 @@ module ActiveResource
           prefix_options, query_options = split_options(options[:params])
           path = element_path(id, prefix_options, query_options)
           response = connection.head(path, headers)
-          response.code == 200
+          response.code.to_i == 200
         end
         # id && !find_single(id, options).nil?
       rescue ActiveResource::ResourceNotFound
@@ -840,8 +843,13 @@ module ActiveResource
     #
     #   my_group.to_xml(:skip_instruct => true)
     #   # => <subsidiary_group> [...] </subsidiary_group>
-    def to_xml(options={})
-      attributes.to_xml({:root => self.class.element_name}.merge(options))
+    def encode(options={})
+      case self.class.format
+        when ActiveResource::Formats[:xml]
+          self.class.format.encode(attributes, {:root => self.class.element_name}.merge(options))
+        else
+          self.class.format.encode(attributes, options)
+      end
     end
 
     # A method to reload the attributes of this object from the remote web service.
@@ -926,14 +934,14 @@ module ActiveResource
 
       # Update the resource on the remote service.
       def update
-        returning connection.put(element_path(prefix_options), to_xml, self.class.headers) do |response|
+        returning connection.put(element_path(prefix_options), encode, self.class.headers) do |response|
           load_attributes_from_response(response)
         end
       end
 
       # Create (i.e., save to the remote service) the new resource.
       def create
-        returning connection.post(collection_path, to_xml, self.class.headers) do |response|
+        returning connection.post(collection_path, encode, self.class.headers) do |response|
           self.id = id_from_response(response)
           load_attributes_from_response(response)
         end
@@ -988,7 +996,11 @@ module ActiveResource
           self.class.const_get(resource_name)
         end
       rescue NameError
-        resource = self.class.const_set(resource_name, Class.new(ActiveResource::Base))
+        if self.class.const_defined?(resource_name)
+          resource = self.class.const_get(resource_name)
+        else
+          resource = self.class.const_set(resource_name, Class.new(ActiveResource::Base))
+        end
         resource.prefix = self.class.prefix
         resource.site   = self.class.site
         resource
diff --git a/vendor/rails/activeresource/lib/active_resource/connection.rb b/vendor/rails/activeresource/lib/active_resource/connection.rb
index 0c4ea432..2a141186 100644
--- a/vendor/rails/activeresource/lib/active_resource/connection.rb
+++ b/vendor/rails/activeresource/lib/active_resource/connection.rb
@@ -63,6 +63,13 @@ module ActiveResource
   # This class is used by ActiveResource::Base to interface with REST
   # services.
   class Connection
+
+    HTTP_FORMAT_HEADER_NAMES = {  :get => 'Accept',
+      :put => 'Content-Type',
+      :post => 'Content-Type',
+      :delete => 'Accept'
+    }
+
     attr_reader :site, :user, :password, :timeout
     attr_accessor :format
 
@@ -106,25 +113,25 @@ module ActiveResource
     # Execute a GET request.
     # Used to get (find) resources.
     def get(path, headers = {})
-      format.decode(request(:get, path, build_request_headers(headers)).body)
+      format.decode(request(:get, path, build_request_headers(headers, :get)).body)
     end
 
     # Execute a DELETE request (see HTTP protocol documentation if unfamiliar).
     # Used to delete resources.
     def delete(path, headers = {})
-      request(:delete, path, build_request_headers(headers))
+      request(:delete, path, build_request_headers(headers, :delete))
     end
 
     # Execute a PUT request (see HTTP protocol documentation if unfamiliar).
     # Used to update resources.
     def put(path, body = '', headers = {})
-      request(:put, path, body.to_s, build_request_headers(headers))
+      request(:put, path, body.to_s, build_request_headers(headers, :put))
     end
 
     # Execute a POST request.
     # Used to create new resources.
     def post(path, body = '', headers = {})
-      request(:post, path, body.to_s, build_request_headers(headers))
+      request(:post, path, body.to_s, build_request_headers(headers, :post))
     end
 
     # Execute a HEAD request.
@@ -187,12 +194,12 @@ module ActiveResource
       end
 
       def default_header
-        @default_header ||= { 'Content-Type' => format.mime_type }
+        @default_header ||= {}
       end
 
       # Builds headers for request to remote service.
-      def build_request_headers(headers)
-        authorization_header.update(default_header).update(headers)
+      def build_request_headers(headers, http_method=nil)
+        authorization_header.update(default_header).update(headers).update(http_format_header(http_method))
       end
 
       # Sets authorization header
@@ -200,6 +207,10 @@ module ActiveResource
         (@user || @password ? { 'Authorization' => 'Basic ' + ["#{@user}:#{ @password}"].pack('m').delete("\r\n") } : {})
       end
 
+      def http_format_header(http_method)
+        {HTTP_FORMAT_HEADER_NAMES[http_method] => format.mime_type}
+      end
+
       def logger #:nodoc:
         ActiveResource::Base.logger
       end
diff --git a/vendor/rails/activeresource/lib/active_resource/custom_methods.rb b/vendor/rails/activeresource/lib/active_resource/custom_methods.rb
index 4c869928..91924e7f 100644
--- a/vendor/rails/activeresource/lib/active_resource/custom_methods.rb
+++ b/vendor/rails/activeresource/lib/active_resource/custom_methods.rb
@@ -30,7 +30,7 @@ module ActiveResource
   #   Person.get(:active)  # GET /people/active.xml
   #   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
   #
-  module CustomMethods 
+  module CustomMethods
     def self.included(base)
       base.class_eval do
         extend ActiveResource::CustomMethods::ClassMethods
@@ -83,24 +83,25 @@ module ActiveResource
         "#{prefix(prefix_options)}#{collection_name}/#{method_name}.#{format.extension}#{query_string(query_options)}"
       end
     end
-    
+
     module InstanceMethods
       def get(method_name, options = {})
         connection.get(custom_method_element_url(method_name, options), self.class.headers)
       end
-      
-      def post(method_name, options = {}, body = '')
+
+      def post(method_name, options = {}, body = nil)
+        request_body = body.nil? ? encode : body
         if new?
-          connection.post(custom_method_new_element_url(method_name, options), (body.nil? ? to_xml : body), self.class.headers)
+          connection.post(custom_method_new_element_url(method_name, options), request_body, self.class.headers)
         else
-          connection.post(custom_method_element_url(method_name, options), body, self.class.headers)
+          connection.post(custom_method_element_url(method_name, options), request_body, self.class.headers)
         end
       end
-      
+
       def put(method_name, options = {}, body = '')
         connection.put(custom_method_element_url(method_name, options), body, self.class.headers)
       end
-      
+
       def delete(method_name, options = {})
         connection.delete(custom_method_element_url(method_name, options), self.class.headers)
       end
@@ -110,7 +111,7 @@ module ActiveResource
         def custom_method_element_url(method_name, options = {})
           "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/#{id}/#{method_name}.#{self.class.format.extension}#{self.class.send!(:query_string, options)}"
         end
-      
+
         def custom_method_new_element_url(method_name, options = {})
           "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/new/#{method_name}.#{self.class.format.extension}#{self.class.send!(:query_string, options)}"
         end
diff --git a/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb b/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb
index df0d6ca3..9e269d4d 100644
--- a/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb
+++ b/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb
@@ -2,22 +2,22 @@ module ActiveResource
   module Formats
     module JsonFormat
       extend self
-      
+
       def extension
         "json"
       end
-      
+
       def mime_type
         "application/json"
       end
-      
-      def encode(hash)
+
+      def encode(hash, options={})
         hash.to_json
       end
-      
+
       def decode(json)
         ActiveSupport::JSON.decode(json)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activeresource/lib/active_resource/formats/xml_format.rb b/vendor/rails/activeresource/lib/active_resource/formats/xml_format.rb
index 5e97ffa7..86c6cec7 100644
--- a/vendor/rails/activeresource/lib/active_resource/formats/xml_format.rb
+++ b/vendor/rails/activeresource/lib/active_resource/formats/xml_format.rb
@@ -2,23 +2,23 @@ module ActiveResource
   module Formats
     module XmlFormat
       extend self
-      
+
       def extension
         "xml"
       end
-      
+
       def mime_type
         "application/xml"
       end
-      
-      def encode(hash)
-        hash.to_xml
+
+      def encode(hash, options={})
+        hash.to_xml(options)
       end
-      
+
       def decode(xml)
         from_xml_data(Hash.from_xml(xml))
       end
-      
+
       private
         # Manipulate from_xml Hash, because xml_simple is not exactly what we
         # want for Active Resource.
@@ -28,7 +28,7 @@ module ActiveResource
           else
             data
           end
-        end      
+        end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activeresource/lib/active_resource/http_mock.rb b/vendor/rails/activeresource/lib/active_resource/http_mock.rb
index 22f83ae9..7b6e110e 100644
--- a/vendor/rails/activeresource/lib/active_resource/http_mock.rb
+++ b/vendor/rails/activeresource/lib/active_resource/http_mock.rb
@@ -146,7 +146,7 @@ module ActiveResource
     attr_accessor :path, :method, :body, :headers
 
     def initialize(method, path, body = nil, headers = {})
-      @method, @path, @body, @headers = method, path, body, headers.reverse_merge('Content-Type' => 'application/xml')
+      @method, @path, @body, @headers = method, path, body, headers.merge(ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method] => 'application/xml')
     end
 
     def ==(other_request)
diff --git a/vendor/rails/activeresource/lib/active_resource/version.rb b/vendor/rails/activeresource/lib/active_resource/version.rb
index 88798ea1..40ad3925 100644
--- a/vendor/rails/activeresource/lib/active_resource/version.rb
+++ b/vendor/rails/activeresource/lib/active_resource/version.rb
@@ -2,7 +2,7 @@ module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/activeresource/test/abstract_unit.rb b/vendor/rails/activeresource/test/abstract_unit.rb
index 615a6d92..e6124120 100644
--- a/vendor/rails/activeresource/test/abstract_unit.rb
+++ b/vendor/rails/activeresource/test/abstract_unit.rb
@@ -9,14 +9,18 @@ require 'setter_trap'
 
 ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log")
 
-# Wrap tests that use Mocha and skip if unavailable.
-def uses_mocha(test_name)
-  unless Object.const_defined?(:Mocha)
-    require 'mocha'
-    require 'stubba'
-  end
+def uses_gem(gem_name, test_name, version = '> 0')
+  require 'rubygems'
+  gem gem_name.to_s, version
+  require gem_name.to_s
   yield
-rescue LoadError => load_error
-  raise unless load_error.message =~ /mocha/i
-  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
-end
\ No newline at end of file
+rescue LoadError
+  $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again."
+end
+
+# Wrap tests that use Mocha and skip if unavailable.
+unless defined? uses_mocha
+  def uses_mocha(test_name, &block)
+    uses_gem('mocha', test_name, '>= 0.5.5', &block)
+  end
+end
diff --git a/vendor/rails/activeresource/test/base/custom_methods_test.rb b/vendor/rails/activeresource/test/base/custom_methods_test.rb
index 62c33ef9..ba5799ed 100644
--- a/vendor/rails/activeresource/test/base/custom_methods_test.rb
+++ b/vendor/rails/activeresource/test/base/custom_methods_test.rb
@@ -10,8 +10,7 @@ class CustomMethodsTest < Test::Unit::TestCase
     @ryan  = { :name => 'Ryan' }.to_xml(:root => 'person')
     @addy  = { :id => 1, :street => '12345 Street' }.to_xml(:root => 'address')
     @addy_deep  = { :id => 1, :street => '12345 Street', :zip => "27519" }.to_xml(:root => 'address')
-    @default_request_headers = { 'Content-Type' => 'application/xml' }
-    
+
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get    "/people/1.xml",             {}, @matz
       mock.get    "/people/1/shallow.xml", {}, @matz
diff --git a/vendor/rails/activeresource/test/base_test.rb b/vendor/rails/activeresource/test/base_test.rb
index 9e2f6c18..b4dc71b4 100644
--- a/vendor/rails/activeresource/test/base_test.rb
+++ b/vendor/rails/activeresource/test/base_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require "fixtures/person"
+require "fixtures/customer"
 require "fixtures/street_address"
 require "fixtures/beast"
 
@@ -15,6 +16,37 @@ class BaseTest < Test::Unit::TestCase
     @people_david = [{ :id => 2, :name => 'David' }].to_xml(:root => 'people')
     @addresses = [{ :id => 1, :street => '12345 Street' }].to_xml(:root => 'addresses')
 
+    # - deep nested resource -
+    # - Luis (Customer)
+    #   - JK (Customer::Friend)
+    #     - Mateo (Customer::Friend::Brother)
+    #       - Edith (Customer::Friend::Brother::Child)
+    #       - Martha (Customer::Friend::Brother::Child)
+    #     - Felipe (Customer::Friend::Brother)
+    #       - Bryan (Customer::Friend::Brother::Child)
+    #       - Luke (Customer::Friend::Brother::Child)
+    #   - Eduardo (Customer::Friend)
+    #     - Sebas (Customer::Friend::Brother)
+    #       - Andres (Customer::Friend::Brother::Child)
+    #       - Jorge (Customer::Friend::Brother::Child)
+    #     - Elsa (Customer::Friend::Brother)
+    #       - Natacha (Customer::Friend::Brother::Child)
+    #     - Milena (Customer::Friend::Brother)
+    #
+    @luis = {:id => 1, :name => 'Luis',
+              :friends => [{:name => 'JK',
+                            :brothers => [{:name => 'Mateo',
+                                           :children => [{:name => 'Edith'},{:name => 'Martha'}]},
+                                          {:name => 'Felipe',
+                                           :children => [{:name => 'Bryan'},{:name => 'Luke'}]}]},
+                           {:name => 'Eduardo',
+                            :brothers => [{:name => 'Sebas',
+                                           :children => [{:name => 'Andres'},{:name => 'Jorge'}]},
+                                          {:name => 'Elsa',
+                                           :children => [{:name => 'Natacha'}]},
+                                          {:name => 'Milena',
+                                           :children => []}]}]}.to_xml(:root => 'customer')
+
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get    "/people/1.xml",                {}, @matz
       mock.get    "/people/2.xml",                {}, @david
@@ -46,6 +78,8 @@ class BaseTest < Test::Unit::TestCase
       mock.head   "/people/1/addresses/2.xml",    {}, nil, 404
       mock.head   "/people/2/addresses/1.xml",    {}, nil, 404
       mock.head   "/people/Greg/addresses/1.xml", {}, nil, 200
+      # customer
+      mock.get    "/customers/1.xml",             {}, @luis
     end
 
     Person.user = nil
@@ -450,7 +484,16 @@ class BaseTest < Test::Unit::TestCase
       assert_equal "the_prefixthe_param_value", person_class.prefix(:the_param => "the_param_value")
     end
   end
-  
+
+  def test_set_prefix_twice_should_clear_params
+    SetterTrap.rollback_sets(Person) do |person_class|
+      person_class.prefix = "the_prefix/:the_param1"
+      assert_equal Set.new([:the_param1]), person_class.prefix_parameters
+      person_class.prefix = "the_prefix/:the_param2"
+      assert_equal Set.new([:the_param2]), person_class.prefix_parameters
+    end
+  end
+
   def test_set_prefix_with_default_value
     SetterTrap.rollback_sets(Person) do |person_class|
       person_class.set_prefix
@@ -776,7 +819,7 @@ class BaseTest < Test::Unit::TestCase
   
   def test_to_xml
     matz = Person.find(1)
-    xml = matz.to_xml
+    xml = matz.encode
     assert xml.starts_with?('<?xml version="1.0" encoding="UTF-8"?>')
     assert xml.include?('<name>Matz</name>')
     assert xml.include?('<id type="integer">1</id>')
@@ -788,4 +831,18 @@ class BaseTest < Test::Unit::TestCase
     matz = Person.find(1)
     assert_equal '1', matz.to_param
   end
+
+  def test_parse_deep_nested_resources
+    luis = Customer.find(1)
+    assert_kind_of Customer, luis
+    luis.friends.each do |friend|
+      assert_kind_of Customer::Friend, friend
+      friend.brothers.each do |brother|
+        assert_kind_of Customer::Friend::Brother, brother
+        brother.children.each do |child|
+          assert_kind_of Customer::Friend::Brother::Child, child
+        end
+      end
+    end
+  end
 end
diff --git a/vendor/rails/activeresource/test/fixtures/customer.rb b/vendor/rails/activeresource/test/fixtures/customer.rb
new file mode 100644
index 00000000..845d5d11
--- /dev/null
+++ b/vendor/rails/activeresource/test/fixtures/customer.rb
@@ -0,0 +1,3 @@
+class Customer < ActiveResource::Base
+  self.site = "http://37s.sunrise.i:3000"
+end
diff --git a/vendor/rails/activeresource/test/format_test.rb b/vendor/rails/activeresource/test/format_test.rb
index 3c81803f..365576a0 100644
--- a/vendor/rails/activeresource/test/format_test.rb
+++ b/vendor/rails/activeresource/test/format_test.rb
@@ -5,14 +5,22 @@ class FormatTest < Test::Unit::TestCase
   def setup
     @matz  = { :id => 1, :name => 'Matz' }
     @david = { :id => 2, :name => 'David' }
-    
+
     @programmers = [ @matz, @david ]
   end
-  
+
+  def test_http_format_header_name
+    header_name = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:get]
+    assert_equal 'Accept', header_name
+
+    headers_names = [ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:put], ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:post]]
+    headers_names.each{|header_name| assert_equal 'Content-Type', header_name}
+  end
+
   def test_formats_on_single_element
     for format in [ :json, :xml ]
       using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people/1.#{format}", {}, ActiveResource::Formats[format].encode(@david)
+        ActiveResource::HttpMock.respond_to.get "/people/1.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david)
         assert_equal @david[:name], Person.find(1).name
       end
     end
@@ -21,7 +29,7 @@ class FormatTest < Test::Unit::TestCase
   def test_formats_on_collection
     for format in [ :json, :xml ]
       using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people.#{format}", {}, ActiveResource::Formats[format].encode(@programmers)
+        ActiveResource::HttpMock.respond_to.get "/people.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@programmers)
         remote_programmers = Person.find(:all)
         assert_equal 2, remote_programmers.size
         assert remote_programmers.select { |p| p.name == 'David' }
@@ -32,7 +40,7 @@ class FormatTest < Test::Unit::TestCase
   def test_formats_on_custom_collection_method
     for format in [ :json, :xml ]
       using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people/retrieve.#{format}?name=David", {}, ActiveResource::Formats[format].encode([@david])
+        ActiveResource::HttpMock.respond_to.get "/people/retrieve.#{format}?name=David", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode([@david])
         remote_programmers = Person.get(:retrieve, :name => 'David')
         assert_equal 1, remote_programmers.size
         assert_equal @david[:id], remote_programmers[0]['id']
@@ -40,13 +48,13 @@ class FormatTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_formats_on_custom_element_method
     for format in [ :json, :xml ]
       using_format(Person, format) do
         ActiveResource::HttpMock.respond_to do |mock|
-          mock.get "/people/2.#{format}", {}, ActiveResource::Formats[format].encode(@david)
-          mock.get "/people/2/shallow.#{format}", {}, ActiveResource::Formats[format].encode(@david)
+          mock.get "/people/2.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david)
+          mock.get "/people/2/shallow.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david)
         end
         remote_programmer = Person.find(2).get(:shallow)
         assert_equal @david[:id], remote_programmer['id']
@@ -57,20 +65,24 @@ class FormatTest < Test::Unit::TestCase
     for format in [ :json, :xml ]
       ryan = ActiveResource::Formats[format].encode({ :name => 'Ryan' })
       using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.post "/people/new/register.#{format}", {}, ryan, 201, 'Location' => "/people/5.#{format}"
         remote_ryan = Person.new(:name => 'Ryan')
+        ActiveResource::HttpMock.respond_to.post "/people.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, {'Location' => "/people/5.#{format}"}
+        remote_ryan.save
+
+        remote_ryan = Person.new(:name => 'Ryan')
+        ActiveResource::HttpMock.respond_to.post "/people/new/register.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, {'Location' => "/people/5.#{format}"}
         assert_equal ActiveResource::Response.new(ryan, 201, {'Location' => "/people/5.#{format}"}), remote_ryan.post(:register)
       end
     end
   end
-  
+
   def test_setting_format_before_site
     resource = Class.new(ActiveResource::Base)
     resource.format = :json
     resource.site   = 'http://37s.sunrise.i:3000'
     assert_equal ActiveResource::Formats[:json], resource.connection.format
   end
-  
+
   private
     def using_format(klass, mime_type_reference)
       previous_format = klass.format
diff --git a/vendor/rails/activesupport/CHANGELOG b/vendor/rails/activesupport/CHANGELOG
index 690bb987..94549722 100644
--- a/vendor/rails/activesupport/CHANGELOG
+++ b/vendor/rails/activesupport/CHANGELOG
@@ -1,3 +1,16 @@
+*2.1.1 (September 4th, 2008)*
+
+* Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved]:activesupport/CHANGELOG
+
+* TimeWithZone: when crossing DST boundary, treat Durations of days, months or years as variable-length, and all other values as absolute length. A time + 24.hours will advance exactly 24 hours, but a time + 1.day will advance 23-25 hours, depending on the day. Ensure consistent behavior across all advancing methods [Geoff Buesing]
+
+* Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, because Ruby's marshaling of Time instances doesn't respect the zone [Geoff Buesing]
+
+* Added StringQuestioneer for doing things like StringQuestioneer.new("production").production? # => true and StringQuestioneer.new("production").development? # => false [DHH]
+
+* Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (Danger)
+
+
 *2.1.0 (May 31st, 2008)*
 
 * TimeZone#to_s shows offset as GMT instead of UTC, because GMT will be more familiar to end users (see time zone selects used by Windows OS, google.com and yahoo.com.) Reverts [8370] [Geoff Buesing]
@@ -166,7 +179,6 @@
 
 * Introduce ActiveSupport::TimeWithZone, for wrapping Time instances with a TimeZone. Introduce instance methods to Time for creating TimeWithZone instances, and class methods for managing a global time zone. [Geoff Buesing]
 
->>>>>>> .r8815
 * Replace non-dst-aware TimeZone class with dst-aware class from tzinfo_timezone plugin. TimeZone#adjust and #unadjust are no longer available; tzinfo gem must now be present in order to perform time zone calculations, via #local_to_utc and #utc_to_local methods. [Geoff Buesing]
 
 * Extract ActiveSupport::Callbacks from Active Record, test case setup and teardown, and ActionController::Dispatcher.  #10727 [Josh Peek]
diff --git a/vendor/rails/activesupport/Rakefile b/vendor/rails/activesupport/Rakefile
index 38ca03b6..6059b08d 100644
--- a/vendor/rails/activesupport/Rakefile
+++ b/vendor/rails/activesupport/Rakefile
@@ -2,6 +2,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
+require 'rake/contrib/rubyforgepublisher'
 
 require File.join(File.dirname(__FILE__), 'lib', 'active_support', 'version')
 
@@ -33,11 +34,11 @@ Rake::RDocTask.new { |rdoc|
   rdoc.title    = "Active Support -- Utility classes and standard library extensions from Rails"
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/active_support.rb')
-  rdoc.rdoc_files.include('lib/active_support/*.rb')
   rdoc.rdoc_files.include('lib/active_support/**/*.rb')
+  rdoc.rdoc_files.exclude('lib/active_support/vendor/*')
 }
 
 spec = Gem::Specification.new do |s|
@@ -65,13 +66,13 @@ end
 
 desc "Publish the beta gem"
 task :pgem => [:package] do
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
+  Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/as", "doc").upload
+  Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/as", "doc").upload
 end
 
 desc "Publish the release files to RubyForge."
@@ -119,7 +120,7 @@ namespace :tzinfo do
   task :copy_definitions => :unpack_gem do
     definitions_path = "#{destination_path}/tzinfo/definitions/"
     mkdir_p definitions_path
-    TimeZone::MAPPING.values.each do |zone|
+    ActiveSupport::TimeZone::MAPPING.values.each do |zone|
       subdir = nil
       if /\// === zone
         subdir = zone.sub(/\w+$/, '')
@@ -172,4 +173,4 @@ namespace :tzinfo do
   def excluded_classes
     %w(country country_index_definition country_info country_timezone timezone_index_definition timezone_proxy tzdataparser)
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activesupport/lib/active_support.rb b/vendor/rails/activesupport/lib/active_support.rb
index e4cb145c..1a8603e8 100644
--- a/vendor/rails/activesupport/lib/active_support.rb
+++ b/vendor/rails/activesupport/lib/active_support.rb
@@ -43,6 +43,8 @@ require 'active_support/ordered_hash'
 require 'active_support/ordered_options'
 require 'active_support/option_merger'
 
+require 'active_support/string_inquirer'
+
 require 'active_support/values/time_zone'
 require 'active_support/duration'
 
@@ -53,3 +55,7 @@ require 'active_support/multibyte'
 require 'active_support/base64'
 
 require 'active_support/time_with_zone'
+
+Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector')
+Dependencies = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Dependencies', 'ActiveSupport::Dependencies')
+TimeZone = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('TimeZone', 'ActiveSupport::TimeZone')
diff --git a/vendor/rails/activesupport/lib/active_support/cache.rb b/vendor/rails/activesupport/lib/active_support/cache.rb
index 2f1143e6..b8ccd357 100644
--- a/vendor/rails/activesupport/lib/active_support/cache.rb
+++ b/vendor/rails/activesupport/lib/active_support/cache.rb
@@ -19,7 +19,7 @@ module ActiveSupport
 
     def self.expand_cache_key(key, namespace = nil)
       expanded_cache_key = namespace ? "#{namespace}/" : ""
-      
+
       if ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
         expanded_cache_key << "#{ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]}/" 
       end
@@ -31,6 +31,8 @@ module ActiveSupport
         key.collect { |element| expand_cache_key(element) }.to_param
       when key.respond_to?(:to_param)
         key.to_param
+      else
+        key.to_s
       end
 
       expanded_cache_key
diff --git a/vendor/rails/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb b/vendor/rails/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
index 9470ac9f..0bff6cf9 100644
--- a/vendor/rails/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
+++ b/vendor/rails/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
@@ -1,14 +1,14 @@
 module ActiveSupport
   module Cache
     class CompressedMemCacheStore < MemCacheStore
-      def read(name, options = {})
-        if value = super(name, options.merge(:raw => true))
+      def read(name, options = nil)
+        if value = super(name, (options || {}).merge(:raw => true))
           Marshal.load(ActiveSupport::Gzip.decompress(value))
         end
       end
 
-      def write(name, value, options = {})
-        super(name, ActiveSupport::Gzip.compress(Marshal.dump(value)), options.merge(:raw => true))
+      def write(name, value, options = nil)
+        super(name, ActiveSupport::Gzip.compress(Marshal.dump(value)), (options || {}).merge(:raw => true))
       end
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/date/behavior.rb b/vendor/rails/activesupport/lib/active_support/core_ext/date/behavior.rb
index 011cc17c..ed1d915e 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/date/behavior.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/date/behavior.rb
@@ -7,6 +7,32 @@ module ActiveSupport #:nodoc:
         def acts_like_date?
           true
         end
+
+        # Date memoizes some instance methods using metaprogramming to wrap
+        # the methods with one that caches the result in an instance variable.
+        # If a Date is frozen but the memoized method hasn't been called, the
+        # first call will result in a frozen object error since the memo
+        # instance variable is uninitialized.
+        #
+        # Work around by eagerly memoizing before freezing.
+        #
+        # Ruby 1.9 uses a preinitialized instance variable so it's unaffected.
+        # This hack is as close as we can get to feature detection:
+        begin
+          ::Date.today.freeze.jd
+        rescue => frozen_object_error
+          if frozen_object_error.message =~ /frozen/
+            def freeze #:nodoc:
+              self.class.private_instance_methods(false).each do |m|
+                if m.to_s =~ /\A__\d+__\Z/
+                  instance_variable_set(:"@#{m}", [send(m)])
+                end
+              end
+
+              super
+            end
+          end
+        end
       end
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb b/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb
index 1e2dbf11..b5180c95 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -184,7 +184,7 @@ module ActiveSupport #:nodoc:
 
         # Returns a new Date/DateTime representing the end of the quarter (last day of march, june, september, december; DateTime objects will have time set to 23:59:59)
         def end_of_quarter
-          change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
+          beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
         end
         alias :at_end_of_quarter :end_of_quarter
 
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/hash/except.rb b/vendor/rails/activesupport/lib/active_support/core_ext/hash/except.rb
index 8362cd88..bc97fa35 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/hash/except.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/hash/except.rb
@@ -10,13 +10,14 @@ module ActiveSupport #:nodoc:
       module Except
         # Returns a new hash without the given keys.
         def except(*keys)
-          rejected = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
-          reject { |key,| rejected.include?(key) }
+          clone.except!(*keys)
         end
 
         # Replaces the hash without only the given keys.
         def except!(*keys)
-          replace(except(*keys))
+          keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
+          keys.each { |key| delete(key) }
+          self
         end
       end
     end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb b/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb
index 6fe5e053..1b2c8f63 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -15,7 +15,9 @@ module ActiveSupport #:nodoc:
         # Returns a new hash with only the given keys.
         def slice(*keys)
           allowed = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
-          reject { |key,| !allowed.include?(key) }
+          hash = {}
+          allowed.each { |k| hash[k] = self[k] if has_key?(k) }
+          hash
         end
 
         # Replaces the hash with only the given keys.
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/module.rb b/vendor/rails/activesupport/lib/active_support/core_ext/module.rb
index da8d5b37..34fcbd12 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/module.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/module.rb
@@ -6,3 +6,8 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/loading'
 require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/module/model_naming'
+
+class Module
+  include ActiveSupport::CoreExt::Module::ModelNaming
+end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb b/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb
new file mode 100644
index 00000000..26e76ab5
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb
@@ -0,0 +1,22 @@
+module ActiveSupport
+  class ModelName < String
+    attr_reader :singular, :plural, :partial_path
+
+    def initialize(name)
+      super
+      @singular = underscore.tr('/', '_').freeze
+      @plural = @singular.pluralize.freeze
+      @partial_path = "#{tableize}/#{demodulize.underscore}".freeze
+    end
+  end
+
+  module CoreExt
+    module Module
+      module ModelNaming
+        def model_name
+          @model_name ||= ModelName.new(name)
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/object/extending.rb b/vendor/rails/activesupport/lib/active_support/core_ext/object/extending.rb
index 43a2be91..082e98a2 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/object/extending.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/object/extending.rb
@@ -3,17 +3,18 @@ class Object
     Class.remove_class(*subclasses_of(*superclasses))
   end
 
+  # Exclude this class unless it's a subclass of our supers and is defined.
+  # We check defined? in case we find a removed class that has yet to be
+  # garbage collected. This also fails for anonymous classes -- please
+  # submit a patch if you have a workaround.
   def subclasses_of(*superclasses) #:nodoc:
     subclasses = []
 
-    # Exclude this class unless it's a subclass of our supers and is defined.
-    # We check defined? in case we find a removed class that has yet to be
-    # garbage collected. This also fails for anonymous classes -- please
-    # submit a patch if you have a workaround.
-    ObjectSpace.each_object(Class) do |k|
-      if superclasses.any? { |superclass| k < superclass } &&
-        (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
-        subclasses << k
+    superclasses.each do |sup|
+      ObjectSpace.each_object(class << sup; self; end) do |k|
+        if k != sup && (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
+          subclasses << k
+        end
       end
     end
 
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/range/blockless_step.rb b/vendor/rails/activesupport/lib/active_support/core_ext/range/blockless_step.rb
index 39dac856..6fa1eb5b 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/range/blockless_step.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/range/blockless_step.rb
@@ -8,7 +8,7 @@ module ActiveSupport #:nodoc:
         end
 
         if RUBY_VERSION < '1.9'
-          def step_with_blockless(value, &block)
+          def step_with_blockless(value = 1, &block)
             if block_given?
               step_without_blockless(value, &block)
             else
@@ -18,7 +18,7 @@ module ActiveSupport #:nodoc:
             end
           end
         else
-          def step_with_blockless(value, &block)
+          def step_with_blockless(value = 1, &block)
             if block_given?
               step_without_blockless(value, &block)
             else
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb b/vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb
new file mode 100644
index 00000000..af8ce3af
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb
@@ -0,0 +1,35 @@
+require 'rexml/document'
+require 'rexml/entity'
+
+# Fixes the rexml vulnerability disclosed at:
+# http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+# This fix is identical to rexml-expansion-fix version 1.0.1
+
+unless REXML::VERSION > "3.1.7.2"
+  module REXML
+    class Entity < Child
+      undef_method :unnormalized
+      def unnormalized
+        document.record_entity_expansion! if document
+        v = value()
+        return nil if v.nil?
+        @unnormalized = Text::unnormalize(v, parent)
+        @unnormalized
+      end
+    end
+    class Document < Element
+      @@entity_expansion_limit = 10_000
+      def self.entity_expansion_limit= val
+        @@entity_expansion_limit = val
+      end
+
+      def record_entity_expansion!
+        @number_of_expansions ||= 0
+        @number_of_expansions += 1
+        if @number_of_expansions > @@entity_expansion_limit
+          raise "Number of entity expansions exceeded, processing aborted."
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string/unicode.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string/unicode.rb
index 5e20534d..666f7bcb 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/string/unicode.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/string/unicode.rb
@@ -1,16 +1,16 @@
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module String #:nodoc:
-      unless '1.9'.respond_to?(:force_encoding)
-        # Define methods for handling unicode data.
-        module Unicode
-          def self.append_features(base)
-            if '1.8.7'.respond_to?(:chars)
-              base.class_eval { remove_method :chars }
-            end
-            super
+      # Define methods for handling unicode data.
+      module Unicode
+        def self.append_features(base)
+          if '1.8.7 and later'.respond_to?(:chars)
+            base.class_eval { remove_method :chars }
           end
+          super
+        end
 
+        unless '1.9'.respond_to?(:force_encoding)
           # +chars+ is a Unicode safe proxy for string methods. It creates and returns an instance of the
           # ActiveSupport::Multibyte::Chars class which encapsulates the original string. A Unicode safe version of all
           # the String methods are defined on this proxy class. Undefined methods are forwarded to String, so all of the
@@ -44,14 +44,12 @@ module ActiveSupport #:nodoc:
           def is_utf8?
             ActiveSupport::Multibyte::Handlers::UTF8Handler.consumes?(self)
           end
-        end
-      else
-        module Unicode #:nodoc:
-          def chars
+        else
+          def chars #:nodoc:
             self
           end
 
-          def is_utf8?
+          def is_utf8? #:nodoc:
             case encoding
               when Encoding::UTF_8
                 valid_encoding?
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/time.rb b/vendor/rails/activesupport/lib/active_support/core_ext/time.rb
index ea50511a..78bbfc91 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/time.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/time.rb
@@ -1,11 +1,32 @@
 require 'date'
 require 'time'
 
-# Ruby 1.8-cvs and 1.9 define private Time#to_date
 class Time
+  # Ruby 1.8-cvs and 1.9 define private Time#to_date
   %w(to_date to_datetime).each do |method|
     public method if private_instance_methods.include?(method)
   end
+
+  # Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
+  # unmarshaled in the local zone, instead of utc. We're layering behavior on the _dump and _load
+  # methods so that utc instances can be flagged on dump, and coerced back to utc on load.
+  if RUBY_VERSION < '1.9'
+    class << self
+      alias_method :_original_load, :_load
+      def _load(marshaled_time)
+        time = _original_load(marshaled_time)
+        utc = time.instance_variable_get('@marshal_with_utc_coercion')
+        utc ? time.utc : time
+      end
+    end
+    
+    alias_method :_original_dump, :_dump
+    def _dump(*args)
+      obj = self.frozen? ? self.dup : self
+      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
+      obj._original_dump(*args)
+    end
+  end
 end
 
 require 'active_support/core_ext/time/behavior'
diff --git a/vendor/rails/activesupport/lib/active_support/dependencies.rb b/vendor/rails/activesupport/lib/active_support/dependencies.rb
index da2ece61..d3d9ff9d 100644
--- a/vendor/rails/activesupport/lib/active_support/dependencies.rb
+++ b/vendor/rails/activesupport/lib/active_support/dependencies.rb
@@ -3,458 +3,459 @@ require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/load_error'
 require 'active_support/core_ext/kernel'
 
-module Dependencies #:nodoc:
-  extend self
+module ActiveSupport #:nodoc:
+  module Dependencies #:nodoc:
+    extend self
 
-  # Should we turn on Ruby warnings on the first load of dependent files?
-  mattr_accessor :warnings_on_first_load
-  self.warnings_on_first_load = false
+    # Should we turn on Ruby warnings on the first load of dependent files?
+    mattr_accessor :warnings_on_first_load
+    self.warnings_on_first_load = false
 
-  # All files ever loaded.
-  mattr_accessor :history
-  self.history = Set.new
+    # All files ever loaded.
+    mattr_accessor :history
+    self.history = Set.new
 
-  # All files currently loaded.
-  mattr_accessor :loaded
-  self.loaded = Set.new
+    # All files currently loaded.
+    mattr_accessor :loaded
+    self.loaded = Set.new
 
-  # Should we load files or require them?
-  mattr_accessor :mechanism
-  self.mechanism = :load
+    # Should we load files or require them?
+    mattr_accessor :mechanism
+    self.mechanism = :load
 
-  # The set of directories from which we may automatically load files. Files
-  # under these directories will be reloaded on each request in development mode,
-  # unless the directory also appears in load_once_paths.
-  mattr_accessor :load_paths
-  self.load_paths = []
+    # The set of directories from which we may automatically load files. Files
+    # under these directories will be reloaded on each request in development mode,
+    # unless the directory also appears in load_once_paths.
+    mattr_accessor :load_paths
+    self.load_paths = []
 
-  # The set of directories from which automatically loaded constants are loaded
-  # only once. All directories in this set must also be present in +load_paths+.
-  mattr_accessor :load_once_paths
-  self.load_once_paths = []
+    # The set of directories from which automatically loaded constants are loaded
+    # only once. All directories in this set must also be present in +load_paths+.
+    mattr_accessor :load_once_paths
+    self.load_once_paths = []
 
-  # An array of qualified constant names that have been loaded. Adding a name to
-  # this array will cause it to be unloaded the next time Dependencies are cleared.
-  mattr_accessor :autoloaded_constants
-  self.autoloaded_constants = []
+    # An array of qualified constant names that have been loaded. Adding a name to
+    # this array will cause it to be unloaded the next time Dependencies are cleared.
+    mattr_accessor :autoloaded_constants
+    self.autoloaded_constants = []
 
-  # An array of constant names that need to be unloaded on every request. Used
-  # to allow arbitrary constants to be marked for unloading.
-  mattr_accessor :explicitly_unloadable_constants
-  self.explicitly_unloadable_constants = []
+    # An array of constant names that need to be unloaded on every request. Used
+    # to allow arbitrary constants to be marked for unloading.
+    mattr_accessor :explicitly_unloadable_constants
+    self.explicitly_unloadable_constants = []
 
-  # Set to true to enable logging of const_missing and file loads
-  mattr_accessor :log_activity
-  self.log_activity = false
+    # Set to true to enable logging of const_missing and file loads
+    mattr_accessor :log_activity
+    self.log_activity = false
 
-  # An internal stack used to record which constants are loaded by any block.
-  mattr_accessor :constant_watch_stack
-  self.constant_watch_stack = []
+    # An internal stack used to record which constants are loaded by any block.
+    mattr_accessor :constant_watch_stack
+    self.constant_watch_stack = []
 
-  def load?
-    mechanism == :load
-  end
-
-  def depend_on(file_name, swallow_load_errors = false)
-    path = search_for_file(file_name)
-    require_or_load(path || file_name)
-  rescue LoadError
-    raise unless swallow_load_errors
-  end
-
-  def associate_with(file_name)
-    depend_on(file_name, true)
-  end
-
-  def clear
-    log_call
-    loaded.clear
-    remove_unloadable_constants!
-  end
-
-  def require_or_load(file_name, const_path = nil)
-    log_call file_name, const_path
-    file_name = $1 if file_name =~ /^(.*)\.rb$/
-    expanded = File.expand_path(file_name)
-    return if loaded.include?(expanded)
-
-    # Record that we've seen this file *before* loading it to avoid an
-    # infinite loop with mutual dependencies.
-    loaded << expanded
-
-    begin
-      if load?
-        log "loading #{file_name}"
-
-        # Enable warnings iff this file has not been loaded before and
-        # warnings_on_first_load is set.
-        load_args = ["#{file_name}.rb"]
-        load_args << const_path unless const_path.nil?
-
-        if !warnings_on_first_load or history.include?(expanded)
-          result = load_file(*load_args)
-        else
-          enable_warnings { result = load_file(*load_args) }
-        end
-      else
-        log "requiring #{file_name}"
-        result = require file_name
-      end
-    rescue Exception
-      loaded.delete expanded
-      raise
+    def load?
+      mechanism == :load
     end
 
-    # Record history *after* loading so first load gets warnings.
-    history << expanded
-    return result
-  end
-
-  # Is the provided constant path defined?
-  def qualified_const_defined?(path)
-    raise NameError, "#{path.inspect} is not a valid constant name!" unless
-      /^(::)?([A-Z]\w*)(::[A-Z]\w*)*$/ =~ path
-
-    names = path.to_s.split('::')
-    names.shift if names.first.empty?
-
-    # We can't use defined? because it will invoke const_missing for the parent
-    # of the name we are checking.
-    names.inject(Object) do |mod, name|
-      return false unless uninherited_const_defined?(mod, name)
-      mod.const_get name
-    end
-    return true
-  end
-
-  if Module.method(:const_defined?).arity == 1
-    # Does this module define this constant?
-    # Wrapper to accomodate changing Module#const_defined? in Ruby 1.9
-    def uninherited_const_defined?(mod, const)
-      mod.const_defined?(const)
-    end
-  else
-    def uninherited_const_defined?(mod, const) #:nodoc:
-      mod.const_defined?(const, false)
-    end
-  end
-
-  # Given +path+, a filesystem path to a ruby file, return an array of constant
-  # paths which would cause Dependencies to attempt to load this file.
-  def loadable_constants_for_path(path, bases = load_paths)
-    path = $1 if path =~ /\A(.*)\.rb\Z/
-    expanded_path = File.expand_path(path)
-
-    bases.collect do |root|
-      expanded_root = File.expand_path(root)
-      next unless %r{\A#{Regexp.escape(expanded_root)}(/|\\)} =~ expanded_path
-
-      nesting = expanded_path[(expanded_root.size)..-1]
-      nesting = nesting[1..-1] if nesting && nesting[0] == ?/
-      next if nesting.blank?
-
-      [
-        nesting.camelize,
-        # Special case: application.rb might define ApplicationControlller.
-        ('ApplicationController' if nesting == 'application')
-      ]
-    end.flatten.compact.uniq
-  end
-
-  # Search for a file in load_paths matching the provided suffix.
-  def search_for_file(path_suffix)
-    path_suffix = path_suffix + '.rb' unless path_suffix.ends_with? '.rb'
-    load_paths.each do |root|
-      path = File.join(root, path_suffix)
-      return path if File.file? path
-    end
-    nil # Gee, I sure wish we had first_match ;-)
-  end
-
-  # Does the provided path_suffix correspond to an autoloadable module?
-  # Instead of returning a boolean, the autoload base for this module is returned.
-  def autoloadable_module?(path_suffix)
-    load_paths.each do |load_path|
-      return load_path if File.directory? File.join(load_path, path_suffix)
-    end
-    nil
-  end
-
-  def load_once_path?(path)
-    load_once_paths.any? { |base| path.starts_with? base }
-  end
-
-  # Attempt to autoload the provided module name by searching for a directory
-  # matching the expect path suffix. If found, the module is created and assigned
-  # to +into+'s constants with the name +const_name+. Provided that the directory
-  # was loaded from a reloadable base path, it is added to the set of constants
-  # that are to be unloaded.
-  def autoload_module!(into, const_name, qualified_name, path_suffix)
-    return nil unless base_path = autoloadable_module?(path_suffix)
-    mod = Module.new
-    into.const_set const_name, mod
-    autoloaded_constants << qualified_name unless load_once_paths.include?(base_path)
-    return mod
-  end
-
-  # Load the file at the provided path. +const_paths+ is a set of qualified
-  # constant names. When loading the file, Dependencies will watch for the
-  # addition of these constants. Each that is defined will be marked as
-  # autoloaded, and will be removed when Dependencies.clear is next called.
-  #
-  # If the second parameter is left off, then Dependencies will construct a set
-  # of names that the file at +path+ may define. See
-  # +loadable_constants_for_path+ for more details.
-  def load_file(path, const_paths = loadable_constants_for_path(path))
-    log_call path, const_paths
-    const_paths = [const_paths].compact unless const_paths.is_a? Array
-    parent_paths = const_paths.collect { |const_path| /(.*)::[^:]+\Z/ =~ const_path ? $1 : :Object }
-
-    result = nil
-    newly_defined_paths = new_constants_in(*parent_paths) do
-      result = load_without_new_constant_marking path
+    def depend_on(file_name, swallow_load_errors = false)
+      path = search_for_file(file_name)
+      require_or_load(path || file_name)
+    rescue LoadError
+      raise unless swallow_load_errors
     end
 
-    autoloaded_constants.concat newly_defined_paths unless load_once_path?(path)
-    autoloaded_constants.uniq!
-    log "loading #{path} defined #{newly_defined_paths * ', '}" unless newly_defined_paths.empty?
-    return result
-  end
-
-  # Return the constant path for the provided parent and constant name.
-  def qualified_name_for(mod, name)
-    mod_name = to_constant_name mod
-    (%w(Object Kernel).include? mod_name) ? name.to_s : "#{mod_name}::#{name}"
-  end
-
-  # Load the constant named +const_name+ which is missing from +from_mod+. If
-  # it is not possible to load the constant into from_mod, try its parent module
-  # using const_missing.
-  def load_missing_constant(from_mod, const_name)
-    log_call from_mod, const_name
-    if from_mod == Kernel
-      if ::Object.const_defined?(const_name)
-        log "Returning Object::#{const_name} for Kernel::#{const_name}"
-        return ::Object.const_get(const_name)
-      else
-        log "Substituting Object for Kernel"
-        from_mod = Object
-      end
+    def associate_with(file_name)
+      depend_on(file_name, true)
     end
 
-    # If we have an anonymous module, all we can do is attempt to load from Object.
-    from_mod = Object if from_mod.name.blank?
-
-    unless qualified_const_defined?(from_mod.name) && from_mod.name.constantize.object_id == from_mod.object_id
-      raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
+    def clear
+      log_call
+      loaded.clear
+      remove_unloadable_constants!
     end
 
-    raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if uninherited_const_defined?(from_mod, const_name)
+    def require_or_load(file_name, const_path = nil)
+      log_call file_name, const_path
+      file_name = $1 if file_name =~ /^(.*)\.rb$/
+      expanded = File.expand_path(file_name)
+      return if loaded.include?(expanded)
 
-    qualified_name = qualified_name_for from_mod, const_name
-    path_suffix = qualified_name.underscore
-    name_error = NameError.new("uninitialized constant #{qualified_name}")
+      # Record that we've seen this file *before* loading it to avoid an
+      # infinite loop with mutual dependencies.
+      loaded << expanded
 
-    file_path = search_for_file(path_suffix)
-    if file_path && ! loaded.include?(File.expand_path(file_path)) # We found a matching file to load
-      require_or_load file_path
-      raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless uninherited_const_defined?(from_mod, const_name)
-      return from_mod.const_get(const_name)
-    elsif mod = autoload_module!(from_mod, const_name, qualified_name, path_suffix)
-      return mod
-    elsif (parent = from_mod.parent) && parent != from_mod &&
-          ! from_mod.parents.any? { |p| uninherited_const_defined?(p, const_name) }
-      # If our parents do not have a constant named +const_name+ then we are free
-      # to attempt to load upwards. If they do have such a constant, then this
-      # const_missing must be due to from_mod::const_name, which should not
-      # return constants from from_mod's parents.
       begin
-        return parent.const_missing(const_name)
-      rescue NameError => e
-        raise unless e.missing_name? qualified_name_for(parent, const_name)
-        raise name_error
+        if load?
+          log "loading #{file_name}"
+
+          # Enable warnings iff this file has not been loaded before and
+          # warnings_on_first_load is set.
+          load_args = ["#{file_name}.rb"]
+          load_args << const_path unless const_path.nil?
+
+          if !warnings_on_first_load or history.include?(expanded)
+            result = load_file(*load_args)
+          else
+            enable_warnings { result = load_file(*load_args) }
+          end
+        else
+          log "requiring #{file_name}"
+          result = require file_name
+        end
+      rescue Exception
+        loaded.delete expanded
+        raise
       end
-    else
-      raise name_error
+
+      # Record history *after* loading so first load gets warnings.
+      history << expanded
+      return result
     end
-  end
 
-  # Remove the constants that have been autoloaded, and those that have been
-  # marked for unloading.
-  def remove_unloadable_constants!
-    autoloaded_constants.each { |const| remove_constant const }
-    autoloaded_constants.clear
-    explicitly_unloadable_constants.each { |const| remove_constant const }
-  end
+    # Is the provided constant path defined?
+    def qualified_const_defined?(path)
+      raise NameError, "#{path.inspect} is not a valid constant name!" unless
+        /^(::)?([A-Z]\w*)(::[A-Z]\w*)*$/ =~ path
 
-  # Determine if the given constant has been automatically loaded.
-  def autoloaded?(desc)
-    # No name => anonymous module.
-    return false if desc.is_a?(Module) && desc.name.blank?
-    name = to_constant_name desc
-    return false unless qualified_const_defined? name
-    return autoloaded_constants.include?(name)
-  end
+      names = path.to_s.split('::')
+      names.shift if names.first.empty?
 
-  # Will the provided constant descriptor be unloaded?
-  def will_unload?(const_desc)
-    autoloaded?(desc) ||
-      explicitly_unloadable_constants.include?(to_constant_name(const_desc))
-  end
-
-  # Mark the provided constant name for unloading. This constant will be
-  # unloaded on each request, not just the next one.
-  def mark_for_unload(const_desc)
-    name = to_constant_name const_desc
-    if explicitly_unloadable_constants.include? name
-      return false
-    else
-      explicitly_unloadable_constants << name
+      # We can't use defined? because it will invoke const_missing for the parent
+      # of the name we are checking.
+      names.inject(Object) do |mod, name|
+        return false unless uninherited_const_defined?(mod, name)
+        mod.const_get name
+      end
       return true
     end
-  end
 
-  # Run the provided block and detect the new constants that were loaded during
-  # its execution. Constants may only be regarded as 'new' once -- so if the
-  # block calls +new_constants_in+ again, then the constants defined within the
-  # inner call will not be reported in this one.
-  #
-  # If the provided block does not run to completion, and instead raises an
-  # exception, any new constants are regarded as being only partially defined
-  # and will be removed immediately.
-  def new_constants_in(*descs)
-    log_call(*descs)
+    if Module.method(:const_defined?).arity == 1
+      # Does this module define this constant?
+      # Wrapper to accomodate changing Module#const_defined? in Ruby 1.9
+      def uninherited_const_defined?(mod, const)
+        mod.const_defined?(const)
+      end
+    else
+      def uninherited_const_defined?(mod, const) #:nodoc:
+        mod.const_defined?(const, false)
+      end
+    end
 
-    # Build the watch frames. Each frame is a tuple of
-    #   [module_name_as_string, constants_defined_elsewhere]
-    watch_frames = descs.collect do |desc|
-      if desc.is_a? Module
-        mod_name = desc.name
-        initial_constants = desc.local_constant_names
-      elsif desc.is_a?(String) || desc.is_a?(Symbol)
-        mod_name = desc.to_s
+    # Given +path+, a filesystem path to a ruby file, return an array of constant
+    # paths which would cause Dependencies to attempt to load this file.
+    def loadable_constants_for_path(path, bases = load_paths)
+      path = $1 if path =~ /\A(.*)\.rb\Z/
+      expanded_path = File.expand_path(path)
 
-        # Handle the case where the module has yet to be defined.
-        initial_constants = if qualified_const_defined?(mod_name)
-          mod_name.constantize.local_constant_names
+      bases.collect do |root|
+        expanded_root = File.expand_path(root)
+        next unless %r{\A#{Regexp.escape(expanded_root)}(/|\\)} =~ expanded_path
+
+        nesting = expanded_path[(expanded_root.size)..-1]
+        nesting = nesting[1..-1] if nesting && nesting[0] == ?/
+        next if nesting.blank?
+
+        [
+          nesting.camelize,
+          # Special case: application.rb might define ApplicationControlller.
+          ('ApplicationController' if nesting == 'application')
+        ]
+      end.flatten.compact.uniq
+    end
+
+    # Search for a file in load_paths matching the provided suffix.
+    def search_for_file(path_suffix)
+      path_suffix = path_suffix + '.rb' unless path_suffix.ends_with? '.rb'
+      load_paths.each do |root|
+        path = File.join(root, path_suffix)
+        return path if File.file? path
+      end
+      nil # Gee, I sure wish we had first_match ;-)
+    end
+
+    # Does the provided path_suffix correspond to an autoloadable module?
+    # Instead of returning a boolean, the autoload base for this module is returned.
+    def autoloadable_module?(path_suffix)
+      load_paths.each do |load_path|
+        return load_path if File.directory? File.join(load_path, path_suffix)
+      end
+      nil
+    end
+
+    def load_once_path?(path)
+      load_once_paths.any? { |base| path.starts_with? base }
+    end
+
+    # Attempt to autoload the provided module name by searching for a directory
+    # matching the expect path suffix. If found, the module is created and assigned
+    # to +into+'s constants with the name +const_name+. Provided that the directory
+    # was loaded from a reloadable base path, it is added to the set of constants
+    # that are to be unloaded.
+    def autoload_module!(into, const_name, qualified_name, path_suffix)
+      return nil unless base_path = autoloadable_module?(path_suffix)
+      mod = Module.new
+      into.const_set const_name, mod
+      autoloaded_constants << qualified_name unless load_once_paths.include?(base_path)
+      return mod
+    end
+
+    # Load the file at the provided path. +const_paths+ is a set of qualified
+    # constant names. When loading the file, Dependencies will watch for the
+    # addition of these constants. Each that is defined will be marked as
+    # autoloaded, and will be removed when Dependencies.clear is next called.
+    #
+    # If the second parameter is left off, then Dependencies will construct a set
+    # of names that the file at +path+ may define. See
+    # +loadable_constants_for_path+ for more details.
+    def load_file(path, const_paths = loadable_constants_for_path(path))
+      log_call path, const_paths
+      const_paths = [const_paths].compact unless const_paths.is_a? Array
+      parent_paths = const_paths.collect { |const_path| /(.*)::[^:]+\Z/ =~ const_path ? $1 : :Object }
+
+      result = nil
+      newly_defined_paths = new_constants_in(*parent_paths) do
+        result = load_without_new_constant_marking path
+      end
+
+      autoloaded_constants.concat newly_defined_paths unless load_once_path?(path)
+      autoloaded_constants.uniq!
+      log "loading #{path} defined #{newly_defined_paths * ', '}" unless newly_defined_paths.empty?
+      return result
+    end
+
+    # Return the constant path for the provided parent and constant name.
+    def qualified_name_for(mod, name)
+      mod_name = to_constant_name mod
+      (%w(Object Kernel).include? mod_name) ? name.to_s : "#{mod_name}::#{name}"
+    end
+
+    # Load the constant named +const_name+ which is missing from +from_mod+. If
+    # it is not possible to load the constant into from_mod, try its parent module
+    # using const_missing.
+    def load_missing_constant(from_mod, const_name)
+      log_call from_mod, const_name
+      if from_mod == Kernel
+        if ::Object.const_defined?(const_name)
+          log "Returning Object::#{const_name} for Kernel::#{const_name}"
+          return ::Object.const_get(const_name)
         else
-         []
+          log "Substituting Object for Kernel"
+          from_mod = Object
+        end
+      end
+
+      # If we have an anonymous module, all we can do is attempt to load from Object.
+      from_mod = Object if from_mod.name.blank?
+
+      unless qualified_const_defined?(from_mod.name) && from_mod.name.constantize.object_id == from_mod.object_id
+        raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
+      end
+
+      raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if uninherited_const_defined?(from_mod, const_name)
+
+      qualified_name = qualified_name_for from_mod, const_name
+      path_suffix = qualified_name.underscore
+      name_error = NameError.new("uninitialized constant #{qualified_name}")
+
+      file_path = search_for_file(path_suffix)
+      if file_path && ! loaded.include?(File.expand_path(file_path)) # We found a matching file to load
+        require_or_load file_path
+        raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless uninherited_const_defined?(from_mod, const_name)
+        return from_mod.const_get(const_name)
+      elsif mod = autoload_module!(from_mod, const_name, qualified_name, path_suffix)
+        return mod
+      elsif (parent = from_mod.parent) && parent != from_mod &&
+            ! from_mod.parents.any? { |p| uninherited_const_defined?(p, const_name) }
+        # If our parents do not have a constant named +const_name+ then we are free
+        # to attempt to load upwards. If they do have such a constant, then this
+        # const_missing must be due to from_mod::const_name, which should not
+        # return constants from from_mod's parents.
+        begin
+          return parent.const_missing(const_name)
+        rescue NameError => e
+          raise unless e.missing_name? qualified_name_for(parent, const_name)
+          raise name_error
         end
       else
-        raise Argument, "#{desc.inspect} does not describe a module!"
+        raise name_error
       end
-
-      [mod_name, initial_constants]
     end
 
-    constant_watch_stack.concat watch_frames
+    # Remove the constants that have been autoloaded, and those that have been
+    # marked for unloading.
+    def remove_unloadable_constants!
+      autoloaded_constants.each { |const| remove_constant const }
+      autoloaded_constants.clear
+      explicitly_unloadable_constants.each { |const| remove_constant const }
+    end
 
-    aborting = true
-    begin
-      yield # Now yield to the code that is to define new constants.
-      aborting = false
+    # Determine if the given constant has been automatically loaded.
+    def autoloaded?(desc)
+      # No name => anonymous module.
+      return false if desc.is_a?(Module) && desc.name.blank?
+      name = to_constant_name desc
+      return false unless qualified_const_defined? name
+      return autoloaded_constants.include?(name)
+    end
+
+    # Will the provided constant descriptor be unloaded?
+    def will_unload?(const_desc)
+      autoloaded?(const_desc) ||
+        explicitly_unloadable_constants.include?(to_constant_name(const_desc))
+    end
+
+    # Mark the provided constant name for unloading. This constant will be
+    # unloaded on each request, not just the next one.
+    def mark_for_unload(const_desc)
+      name = to_constant_name const_desc
+      if explicitly_unloadable_constants.include? name
+        return false
+      else
+        explicitly_unloadable_constants << name
+        return true
+      end
+    end
+
+    # Run the provided block and detect the new constants that were loaded during
+    # its execution. Constants may only be regarded as 'new' once -- so if the
+    # block calls +new_constants_in+ again, then the constants defined within the
+    # inner call will not be reported in this one.
+    #
+    # If the provided block does not run to completion, and instead raises an
+    # exception, any new constants are regarded as being only partially defined
+    # and will be removed immediately.
+    def new_constants_in(*descs)
+      log_call(*descs)
+
+      # Build the watch frames. Each frame is a tuple of
+      #   [module_name_as_string, constants_defined_elsewhere]
+      watch_frames = descs.collect do |desc|
+        if desc.is_a? Module
+          mod_name = desc.name
+          initial_constants = desc.local_constant_names
+        elsif desc.is_a?(String) || desc.is_a?(Symbol)
+          mod_name = desc.to_s
+
+          # Handle the case where the module has yet to be defined.
+          initial_constants = if qualified_const_defined?(mod_name)
+            mod_name.constantize.local_constant_names
+          else
+           []
+          end
+        else
+          raise Argument, "#{desc.inspect} does not describe a module!"
+        end
+
+        [mod_name, initial_constants]
+      end
+
+      constant_watch_stack.concat watch_frames
+
+      aborting = true
+      begin
+        yield # Now yield to the code that is to define new constants.
+        aborting = false
+      ensure
+        # Find the new constants.
+        new_constants = watch_frames.collect do |mod_name, prior_constants|
+          # Module still doesn't exist? Treat it as if it has no constants.
+          next [] unless qualified_const_defined?(mod_name)
+
+          mod = mod_name.constantize
+          next [] unless mod.is_a? Module
+          new_constants = mod.local_constant_names - prior_constants
+
+          # Make sure no other frames takes credit for these constants.
+          constant_watch_stack.each do |frame_name, constants|
+            constants.concat new_constants if frame_name == mod_name
+          end
+
+          new_constants.collect do |suffix|
+            mod_name == "Object" ? suffix : "#{mod_name}::#{suffix}"
+          end
+        end.flatten
+
+        log "New constants: #{new_constants * ', '}"
+
+        if aborting
+          log "Error during loading, removing partially loaded constants "
+          new_constants.each { |name| remove_constant name }
+          new_constants.clear
+        end
+      end
+
+      return new_constants
     ensure
-      # Find the new constants.
-      new_constants = watch_frames.collect do |mod_name, prior_constants|
-        # Module still doesn't exist? Treat it as if it has no constants.
-        next [] unless qualified_const_defined?(mod_name)
-
-        mod = mod_name.constantize
-        next [] unless mod.is_a? Module
-        new_constants = mod.local_constant_names - prior_constants
-
-        # Make sure no other frames takes credit for these constants.
-        constant_watch_stack.each do |frame_name, constants|
-          constants.concat new_constants if frame_name == mod_name
+      # Remove the stack frames that we added.
+      if defined?(watch_frames) && ! watch_frames.blank?
+        frame_ids = watch_frames.collect(&:object_id)
+        constant_watch_stack.delete_if do |watch_frame|
+          frame_ids.include? watch_frame.object_id
         end
+      end
+    end
 
-        new_constants.collect do |suffix|
-          mod_name == "Object" ? suffix : "#{mod_name}::#{suffix}"
+    class LoadingModule #:nodoc:
+      # Old style environment.rb referenced this method directly.  Please note, it doesn't
+      # actually *do* anything any more.
+      def self.root(*args)
+        if defined?(RAILS_DEFAULT_LOGGER)
+          RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
+          RAILS_DEFAULT_LOGGER.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
         end
-      end.flatten
-
-      log "New constants: #{new_constants * ', '}"
-
-      if aborting
-        log "Error during loading, removing partially loaded constants "
-        new_constants.each { |name| remove_constant name }
-        new_constants.clear
       end
     end
 
-    return new_constants
-  ensure
-    # Remove the stack frames that we added.
-    if defined?(watch_frames) && ! watch_frames.blank?
-      frame_ids = watch_frames.collect(&:object_id)
-      constant_watch_stack.delete_if do |watch_frame|
-        frame_ids.include? watch_frame.object_id
+    # Convert the provided const desc to a qualified constant name (as a string).
+    # A module, class, symbol, or string may be provided.
+    def to_constant_name(desc) #:nodoc:
+      name = case desc
+        when String then desc.starts_with?('::') ? desc[2..-1] : desc
+        when Symbol then desc.to_s
+        when Module
+          raise ArgumentError, "Anonymous modules have no name to be referenced by" if desc.name.blank?
+          desc.name
+        else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
       end
     end
-  end
 
-  class LoadingModule #:nodoc:
-    # Old style environment.rb referenced this method directly.  Please note, it doesn't
-    # actually *do* anything any more.
-    def self.root(*args)
-      if defined?(RAILS_DEFAULT_LOGGER)
-        RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
-        RAILS_DEFAULT_LOGGER.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
+    def remove_constant(const) #:nodoc:
+      return false unless qualified_const_defined? const
+
+      const = $1 if /\A::(.*)\Z/ =~ const.to_s
+      names = const.to_s.split('::')
+      if names.size == 1 # It's under Object
+        parent = Object
+      else
+        parent = (names[0..-2] * '::').constantize
       end
-    end
-  end
 
-  # Convert the provided const desc to a qualified constant name (as a string).
-  # A module, class, symbol, or string may be provided.
-  def to_constant_name(desc) #:nodoc:
-    name = case desc
-      when String then desc.starts_with?('::') ? desc[2..-1] : desc
-      when Symbol then desc.to_s
-      when Module
-        raise ArgumentError, "Anonymous modules have no name to be referenced by" if desc.name.blank?
-        desc.name
-      else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
-    end
-  end
-
-  def remove_constant(const) #:nodoc:
-    return false unless qualified_const_defined? const
-
-    const = $1 if /\A::(.*)\Z/ =~ const.to_s
-    names = const.to_s.split('::')
-    if names.size == 1 # It's under Object
-      parent = Object
-    else
-      parent = (names[0..-2] * '::').constantize
+      log "removing constant #{const}"
+      parent.instance_eval { remove_const names.last }
+      return true
     end
 
-    log "removing constant #{const}"
-    parent.instance_eval { remove_const names.last }
-    return true
-  end
+    protected
+      def log_call(*args)
+        if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
+          arg_str = args.collect(&:inspect) * ', '
+          /in `([a-z_\?\!]+)'/ =~ caller(1).first
+          selector = $1 || '<unknown>'
+          log "called #{selector}(#{arg_str})"
+        end
+      end
 
-protected
-  def log_call(*args)
-    if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
-      arg_str = args.collect(&:inspect) * ', '
-      /in `([a-z_\?\!]+)'/ =~ caller(1).first
-      selector = $1 || '<unknown>'
-      log "called #{selector}(#{arg_str})"
-    end
+      def log(msg)
+        if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
+          RAILS_DEFAULT_LOGGER.debug "Dependencies: #{msg}"
+        end
+      end
   end
-
-  def log(msg)
-    if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
-      RAILS_DEFAULT_LOGGER.debug "Dependencies: #{msg}"
-    end
-  end
-
 end
 
 Object.instance_eval do
-  define_method(:require_or_load)     { |file_name| Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
-  define_method(:require_dependency)  { |file_name| Dependencies.depend_on(file_name) }       unless Object.respond_to?(:require_dependency)
-  define_method(:require_association) { |file_name| Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
+  define_method(:require_or_load)     { |file_name| ActiveSupport::Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
+  define_method(:require_dependency)  { |file_name| ActiveSupport::Dependencies.depend_on(file_name) }       unless Object.respond_to?(:require_dependency)
+  define_method(:require_association) { |file_name| ActiveSupport::Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
 end
 
 class Module #:nodoc:
@@ -464,7 +465,7 @@ class Module #:nodoc:
   # Use const_missing to autoload associations so we don't have to
   # require_association when using single-table inheritance.
   def const_missing(class_id)
-    Dependencies.load_missing_constant self, class_id
+    ActiveSupport::Dependencies.load_missing_constant self, class_id
   end
 
   def unloadable(const_desc = self)
@@ -480,15 +481,15 @@ class Class
     else
       begin
         begin
-          Dependencies.load_missing_constant self, const_name
+          ActiveSupport::Dependencies.load_missing_constant self, const_name
         rescue NameError
           parent.send :const_missing, const_name
         end
       rescue NameError => e
         # Make sure that the name we are missing is the one that caused the error
-        parent_qualified_name = Dependencies.qualified_name_for parent, const_name
+        parent_qualified_name = ActiveSupport::Dependencies.qualified_name_for parent, const_name
         raise unless e.missing_name? parent_qualified_name
-        qualified_name = Dependencies.qualified_name_for self, const_name
+        qualified_name = ActiveSupport::Dependencies.qualified_name_for self, const_name
         raise NameError.new("uninitialized constant #{qualified_name}").copy_blame!(e)
       end
     end
@@ -499,14 +500,14 @@ class Object
   alias_method :load_without_new_constant_marking, :load
 
   def load(file, *extras) #:nodoc:
-    Dependencies.new_constants_in(Object) { super }
+    ActiveSupport::Dependencies.new_constants_in(Object) { super }
   rescue Exception => exception  # errors from loading file
     exception.blame_file! file
     raise
   end
 
   def require(file, *extras) #:nodoc:
-    Dependencies.new_constants_in(Object) { super }
+    ActiveSupport::Dependencies.new_constants_in(Object) { super }
   rescue Exception => exception  # errors from required file
     exception.blame_file! file
     raise
@@ -526,7 +527,7 @@ class Object
   # Returns true if the constant was not previously marked for unloading, false
   # otherwise.
   def unloadable(const_desc)
-    Dependencies.mark_for_unload const_desc
+    ActiveSupport::Dependencies.mark_for_unload const_desc
   end
 end
 
diff --git a/vendor/rails/activesupport/lib/active_support/deprecation.rb b/vendor/rails/activesupport/lib/active_support/deprecation.rb
index 758aef54..c474c22e 100644
--- a/vendor/rails/activesupport/lib/active_support/deprecation.rb
+++ b/vendor/rails/activesupport/lib/active_support/deprecation.rb
@@ -92,7 +92,7 @@ module ActiveSupport
             class_eval(<<-EOS, __FILE__, __LINE__)
               def #{target}_with_deprecation#{punctuation}(*args, &block)
                 ::ActiveSupport::Deprecation.warn(self.class.deprecated_method_warning(:#{method_name}, #{options[method_name].inspect}), caller)
-                #{target}_without_deprecation#{punctuation}(*args, &block)
+                send(:#{target}_without_deprecation#{punctuation}, *args, &block)
               end
             EOS
           end
@@ -109,7 +109,7 @@ module ActiveSupport
       end
 
       def deprecation_horizon
-        '2.0'
+        '2.2'
       end
     end
 
@@ -144,17 +144,11 @@ module ActiveSupport
         end
     end
 
-    # Stand-in for <tt>@request</tt>, <tt>@attributes</tt>, <tt>@params</tt>, etc.
-    # which emits deprecation warnings on any method call (except +inspect+).
-    class DeprecatedInstanceVariableProxy #:nodoc:
+    class DeprecationProxy #:nodoc:
       silence_warnings do
         instance_methods.each { |m| undef_method m unless m =~ /^__/ }
       end
 
-      def initialize(instance, method, var = "@#{method}")
-        @instance, @method, @var = instance, method, var
-      end
-
       # Don't give a deprecation warning on inspect since test/unit and error
       # logs rely on it for diagnostics.
       def inspect
@@ -166,7 +160,16 @@ module ActiveSupport
           warn caller, called, args
           target.__send__(called, *args, &block)
         end
+    end
 
+    # Stand-in for <tt>@request</tt>, <tt>@attributes</tt>, <tt>@params</tt>, etc.
+    # which emits deprecation warnings on any method call (except +inspect+).
+    class DeprecatedInstanceVariableProxy < DeprecationProxy #:nodoc:
+      def initialize(instance, method, var = "@#{method}")
+        @instance, @method, @var = instance, method, var
+      end
+
+      private
         def target
           @instance.__send__(@method)
         end
@@ -176,6 +179,21 @@ module ActiveSupport
         end
     end
 
+    class DeprecatedConstantProxy < DeprecationProxy #:nodoc:
+      def initialize(old_const, new_const)
+        @old_const = old_const
+        @new_const = new_const
+      end
+
+      private
+        def target
+          @new_const.to_s.constantize
+        end
+
+        def warn(callstack, called, args)
+          ActiveSupport::Deprecation.warn("#{@old_const} is deprecated! Use #{@new_const} instead.", callstack)
+        end
+    end
   end
 end
 
diff --git a/vendor/rails/activesupport/lib/active_support/inflections.rb b/vendor/rails/activesupport/lib/active_support/inflections.rb
index 967722c2..b6d27695 100644
--- a/vendor/rails/activesupport/lib/active_support/inflections.rb
+++ b/vendor/rails/activesupport/lib/active_support/inflections.rb
@@ -1,53 +1,55 @@
-Inflector.inflections do |inflect|
-  inflect.plural(/$/, 's')
-  inflect.plural(/s$/i, 's')
-  inflect.plural(/(ax|test)is$/i, '\1es')
-  inflect.plural(/(octop|vir)us$/i, '\1i')
-  inflect.plural(/(alias|status)$/i, '\1es')
-  inflect.plural(/(bu)s$/i, '\1ses')
-  inflect.plural(/(buffal|tomat)o$/i, '\1oes')
-  inflect.plural(/([ti])um$/i, '\1a')
-  inflect.plural(/sis$/i, 'ses')
-  inflect.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves')
-  inflect.plural(/(hive)$/i, '\1s')
-  inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
-  inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
-  inflect.plural(/(matr|vert|ind)(?:ix|ex)$/i, '\1ices')
-  inflect.plural(/([m|l])ouse$/i, '\1ice')
-  inflect.plural(/^(ox)$/i, '\1en')
-  inflect.plural(/(quiz)$/i, '\1zes')
+module ActiveSupport
+  Inflector.inflections do |inflect|
+    inflect.plural(/$/, 's')
+    inflect.plural(/s$/i, 's')
+    inflect.plural(/(ax|test)is$/i, '\1es')
+    inflect.plural(/(octop|vir)us$/i, '\1i')
+    inflect.plural(/(alias|status)$/i, '\1es')
+    inflect.plural(/(bu)s$/i, '\1ses')
+    inflect.plural(/(buffal|tomat)o$/i, '\1oes')
+    inflect.plural(/([ti])um$/i, '\1a')
+    inflect.plural(/sis$/i, 'ses')
+    inflect.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves')
+    inflect.plural(/(hive)$/i, '\1s')
+    inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
+    inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
+    inflect.plural(/(matr|vert|ind)(?:ix|ex)$/i, '\1ices')
+    inflect.plural(/([m|l])ouse$/i, '\1ice')
+    inflect.plural(/^(ox)$/i, '\1en')
+    inflect.plural(/(quiz)$/i, '\1zes')
 
-  inflect.singular(/s$/i, '')
-  inflect.singular(/(n)ews$/i, '\1ews')
-  inflect.singular(/([ti])a$/i, '\1um')
-  inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
-  inflect.singular(/(^analy)ses$/i, '\1sis')
-  inflect.singular(/([^f])ves$/i, '\1fe')
-  inflect.singular(/(hive)s$/i, '\1')
-  inflect.singular(/(tive)s$/i, '\1')
-  inflect.singular(/([lr])ves$/i, '\1f')
-  inflect.singular(/([^aeiouy]|qu)ies$/i, '\1y')
-  inflect.singular(/(s)eries$/i, '\1eries')
-  inflect.singular(/(m)ovies$/i, '\1ovie')
-  inflect.singular(/(x|ch|ss|sh)es$/i, '\1')
-  inflect.singular(/([m|l])ice$/i, '\1ouse')
-  inflect.singular(/(bus)es$/i, '\1')
-  inflect.singular(/(o)es$/i, '\1')
-  inflect.singular(/(shoe)s$/i, '\1')
-  inflect.singular(/(cris|ax|test)es$/i, '\1is')
-  inflect.singular(/(octop|vir)i$/i, '\1us')
-  inflect.singular(/(alias|status)es$/i, '\1')
-  inflect.singular(/^(ox)en/i, '\1')
-  inflect.singular(/(vert|ind)ices$/i, '\1ex')
-  inflect.singular(/(matr)ices$/i, '\1ix')
-  inflect.singular(/(quiz)zes$/i, '\1')
+    inflect.singular(/s$/i, '')
+    inflect.singular(/(n)ews$/i, '\1ews')
+    inflect.singular(/([ti])a$/i, '\1um')
+    inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
+    inflect.singular(/(^analy)ses$/i, '\1sis')
+    inflect.singular(/([^f])ves$/i, '\1fe')
+    inflect.singular(/(hive)s$/i, '\1')
+    inflect.singular(/(tive)s$/i, '\1')
+    inflect.singular(/([lr])ves$/i, '\1f')
+    inflect.singular(/([^aeiouy]|qu)ies$/i, '\1y')
+    inflect.singular(/(s)eries$/i, '\1eries')
+    inflect.singular(/(m)ovies$/i, '\1ovie')
+    inflect.singular(/(x|ch|ss|sh)es$/i, '\1')
+    inflect.singular(/([m|l])ice$/i, '\1ouse')
+    inflect.singular(/(bus)es$/i, '\1')
+    inflect.singular(/(o)es$/i, '\1')
+    inflect.singular(/(shoe)s$/i, '\1')
+    inflect.singular(/(cris|ax|test)es$/i, '\1is')
+    inflect.singular(/(octop|vir)i$/i, '\1us')
+    inflect.singular(/(alias|status)es$/i, '\1')
+    inflect.singular(/^(ox)en/i, '\1')
+    inflect.singular(/(vert|ind)ices$/i, '\1ex')
+    inflect.singular(/(matr)ices$/i, '\1ix')
+    inflect.singular(/(quiz)zes$/i, '\1')
 
-  inflect.irregular('person', 'people')
-  inflect.irregular('man', 'men')
-  inflect.irregular('child', 'children')
-  inflect.irregular('sex', 'sexes')
-  inflect.irregular('move', 'moves')
-  inflect.irregular('cow', 'kine')
+    inflect.irregular('person', 'people')
+    inflect.irregular('man', 'men')
+    inflect.irregular('child', 'children')
+    inflect.irregular('sex', 'sexes')
+    inflect.irregular('move', 'moves')
+    inflect.irregular('cow', 'kine')
 
-  inflect.uncountable(%w(equipment information rice money species series fish sheep))
+    inflect.uncountable(%w(equipment information rice money species series fish sheep))
+  end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/inflector.rb b/vendor/rails/activesupport/lib/active_support/inflector.rb
index a4fd6193..dbe098bb 100644
--- a/vendor/rails/activesupport/lib/active_support/inflector.rb
+++ b/vendor/rails/activesupport/lib/active_support/inflector.rb
@@ -1,305 +1,310 @@
 require 'singleton'
 
-# The Inflector transforms words from singular to plural, class names to table names, modularized class names to ones without,
-# and class names to foreign keys. The default inflections for pluralization, singularization, and uncountable words are kept
-# in inflections.rb.
-#
-# The Rails core team has stated patches for the inflections library will not be accepted
-# in order to avoid breaking legacy applications which may be relying on errant inflections.
-# If you discover an incorrect inflection and require it for your application, you'll need
-# to correct it yourself (explained below).
-module Inflector
-  # A singleton instance of this class is yielded by Inflector.inflections, which can then be used to specify additional
-  # inflection rules. Examples:
+module ActiveSupport
+  # The Inflector transforms words from singular to plural, class names to table names, modularized class names to ones without,
+  # and class names to foreign keys. The default inflections for pluralization, singularization, and uncountable words are kept
+  # in inflections.rb.
   #
-  #   Inflector.inflections do |inflect|
-  #     inflect.plural /^(ox)$/i, '\1\2en'
-  #     inflect.singular /^(ox)en/i, '\1'
-  #
-  #     inflect.irregular 'octopus', 'octopi'
-  #
-  #     inflect.uncountable "equipment"
-  #   end
-  #
-  # New rules are added at the top. So in the example above, the irregular rule for octopus will now be the first of the
-  # pluralization and singularization rules that is runs. This guarantees that your rules run before any of the rules that may
-  # already have been loaded.
-  class Inflections
-    include Singleton
-
-    attr_reader :plurals, :singulars, :uncountables
-
-    def initialize
-      @plurals, @singulars, @uncountables = [], [], []
-    end
-
-    # Specifies a new pluralization rule and its replacement. The rule can either be a string or a regular expression.
-    # The replacement should always be a string that may include references to the matched data from the rule.
-    def plural(rule, replacement)
-      @plurals.insert(0, [rule, replacement])
-    end
-
-    # Specifies a new singularization rule and its replacement. The rule can either be a string or a regular expression.
-    # The replacement should always be a string that may include references to the matched data from the rule.
-    def singular(rule, replacement)
-      @singulars.insert(0, [rule, replacement])
-    end
-
-    # Specifies a new irregular that applies to both pluralization and singularization at the same time. This can only be used
-    # for strings, not regular expressions. You simply pass the irregular in singular and plural form.
+  # The Rails core team has stated patches for the inflections library will not be accepted
+  # in order to avoid breaking legacy applications which may be relying on errant inflections.
+  # If you discover an incorrect inflection and require it for your application, you'll need
+  # to correct it yourself (explained below).
+  module Inflector
+    # A singleton instance of this class is yielded by Inflector.inflections, which can then be used to specify additional
+    # inflection rules. Examples:
     #
-    # Examples:
-    #   irregular 'octopus', 'octopi'
-    #   irregular 'person', 'people'
-    def irregular(singular, plural)
-      if singular[0,1].upcase == plural[0,1].upcase
-        plural(Regexp.new("(#{singular[0,1]})#{singular[1..-1]}$", "i"), '\1' + plural[1..-1])
-        singular(Regexp.new("(#{plural[0,1]})#{plural[1..-1]}$", "i"), '\1' + singular[1..-1])
-      else
-        plural(Regexp.new("#{singular[0,1].upcase}(?i)#{singular[1..-1]}$"), plural[0,1].upcase + plural[1..-1])
-        plural(Regexp.new("#{singular[0,1].downcase}(?i)#{singular[1..-1]}$"), plural[0,1].downcase + plural[1..-1])
-        singular(Regexp.new("#{plural[0,1].upcase}(?i)#{plural[1..-1]}$"), singular[0,1].upcase + singular[1..-1])
-        singular(Regexp.new("#{plural[0,1].downcase}(?i)#{plural[1..-1]}$"), singular[0,1].downcase + singular[1..-1])       
+    #   Inflector.inflections do |inflect|
+    #     inflect.plural /^(ox)$/i, '\1\2en'
+    #     inflect.singular /^(ox)en/i, '\1'
+    #
+    #     inflect.irregular 'octopus', 'octopi'
+    #
+    #     inflect.uncountable "equipment"
+    #   end
+    #
+    # New rules are added at the top. So in the example above, the irregular rule for octopus will now be the first of the
+    # pluralization and singularization rules that is runs. This guarantees that your rules run before any of the rules that may
+    # already have been loaded.
+    class Inflections
+      include Singleton
+
+      attr_reader :plurals, :singulars, :uncountables
+
+      def initialize
+        @plurals, @singulars, @uncountables = [], [], []
       end
-    end
 
-    # Add uncountable words that shouldn't be attempted inflected.
-    #
-    # Examples:
-    #   uncountable "money"
-    #   uncountable "money", "information"
-    #   uncountable %w( money information rice )
-    def uncountable(*words)
-      (@uncountables << words).flatten!
-    end
+      # Specifies a new pluralization rule and its replacement. The rule can either be a string or a regular expression.
+      # The replacement should always be a string that may include references to the matched data from the rule.
+      def plural(rule, replacement)
+        @plurals.insert(0, [rule, replacement])
+      end
 
-    # Clears the loaded inflections within a given scope (default is <tt>:all</tt>).
-    # Give the scope as a symbol of the inflection type, the options are: <tt>:plurals</tt>,
-    # <tt>:singulars</tt>, <tt>:uncountables</tt>.
-    #
-    # Examples:
-    #   clear :all
-    #   clear :plurals
-    def clear(scope = :all)
-      case scope
-        when :all
-          @plurals, @singulars, @uncountables = [], [], []
+      # Specifies a new singularization rule and its replacement. The rule can either be a string or a regular expression.
+      # The replacement should always be a string that may include references to the matched data from the rule.
+      def singular(rule, replacement)
+        @singulars.insert(0, [rule, replacement])
+      end
+
+      # Specifies a new irregular that applies to both pluralization and singularization at the same time. This can only be used
+      # for strings, not regular expressions. You simply pass the irregular in singular and plural form.
+      #
+      # Examples:
+      #   irregular 'octopus', 'octopi'
+      #   irregular 'person', 'people'
+      def irregular(singular, plural)
+        if singular[0,1].upcase == plural[0,1].upcase
+          plural(Regexp.new("(#{singular[0,1]})#{singular[1..-1]}$", "i"), '\1' + plural[1..-1])
+          singular(Regexp.new("(#{plural[0,1]})#{plural[1..-1]}$", "i"), '\1' + singular[1..-1])
         else
-          instance_variable_set "@#{scope}", []
+          plural(Regexp.new("#{singular[0,1].upcase}(?i)#{singular[1..-1]}$"), plural[0,1].upcase + plural[1..-1])
+          plural(Regexp.new("#{singular[0,1].downcase}(?i)#{singular[1..-1]}$"), plural[0,1].downcase + plural[1..-1])
+          singular(Regexp.new("#{plural[0,1].upcase}(?i)#{plural[1..-1]}$"), singular[0,1].upcase + singular[1..-1])
+          singular(Regexp.new("#{plural[0,1].downcase}(?i)#{plural[1..-1]}$"), singular[0,1].downcase + singular[1..-1])
+        end
+      end
+
+      # Add uncountable words that shouldn't be attempted inflected.
+      #
+      # Examples:
+      #   uncountable "money"
+      #   uncountable "money", "information"
+      #   uncountable %w( money information rice )
+      def uncountable(*words)
+        (@uncountables << words).flatten!
+      end
+
+      # Clears the loaded inflections within a given scope (default is <tt>:all</tt>).
+      # Give the scope as a symbol of the inflection type, the options are: <tt>:plurals</tt>,
+      # <tt>:singulars</tt>, <tt>:uncountables</tt>.
+      #
+      # Examples:
+      #   clear :all
+      #   clear :plurals
+      def clear(scope = :all)
+        case scope
+          when :all
+            @plurals, @singulars, @uncountables = [], [], []
+          else
+            instance_variable_set "@#{scope}", []
+        end
       end
     end
-  end
 
-  extend self
+    extend self
 
-  # Yields a singleton instance of Inflector::Inflections so you can specify additional
-  # inflector rules.
-  #
-  # Example:
-  #   Inflector.inflections do |inflect|
-  #     inflect.uncountable "rails"
-  #   end
-  def inflections
-    if block_given?
-      yield Inflections.instance
-    else
-      Inflections.instance
-    end
-  end
-
-  # Returns the plural form of the word in the string.
-  #
-  # Examples:
-  #   "post".pluralize             # => "posts"
-  #   "octopus".pluralize          # => "octopi"
-  #   "sheep".pluralize            # => "sheep"
-  #   "words".pluralize            # => "words"
-  #   "the blue mailman".pluralize # => "the blue mailmen"
-  #   "CamelOctopus".pluralize     # => "CamelOctopi"
-  def pluralize(word)
-    result = word.to_s.dup
-
-    if word.empty? || inflections.uncountables.include?(result.downcase)
-      result
-    else
-      inflections.plurals.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
-      result
-    end
-  end
-
-  # The reverse of +pluralize+, returns the singular form of a word in a string.
-  #
-  # Examples:
-  #   "posts".singularize            # => "post"
-  #   "octopi".singularize           # => "octopus"
-  #   "sheep".singluarize            # => "sheep"
-  #   "word".singluarize             # => "word"
-  #   "the blue mailmen".singularize # => "the blue mailman"
-  #   "CamelOctopi".singularize      # => "CamelOctopus"
-  def singularize(word)
-    result = word.to_s.dup
-
-    if inflections.uncountables.include?(result.downcase)
-      result
-    else
-      inflections.singulars.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
-      result
-    end
-  end
-
-  # By default, +camelize+ converts strings to UpperCamelCase. If the argument to +camelize+
-  # is set to <tt>:lower</tt> then +camelize+ produces lowerCamelCase.
-  #
-  # +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces.
-  #
-  # Examples:
-  #   "active_record".camelize                # => "ActiveRecord"
-  #   "active_record".camelize(:lower)        # => "activeRecord"
-  #   "active_record/errors".camelize         # => "ActiveRecord::Errors"
-  #   "active_record/errors".camelize(:lower) # => "activeRecord::Errors"
-  def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
-    if first_letter_in_uppercase
-      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-    else
-      lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
-    end
-  end
-
-  # Capitalizes all the words and replaces some characters in the string to create
-  # a nicer looking title. +titleize+ is meant for creating pretty output. It is not
-  # used in the Rails internals.
-  #
-  # +titleize+ is also aliased as as +titlecase+.
-  #
-  # Examples:
-  #   "man from the boondocks".titleize # => "Man From The Boondocks"
-  #   "x-men: the last stand".titleize  # => "X Men: The Last Stand"
-  def titleize(word)
-    humanize(underscore(word)).gsub(/\b('?[a-z])/) { $1.capitalize }
-  end
-
-  # The reverse of +camelize+. Makes an underscored, lowercase form from the expression in the string.
-  #
-  # Changes '::' to '/' to convert namespaces to paths.
-  #
-  # Examples:
-  #   "ActiveRecord".underscore         # => "active_record"
-  #   "ActiveRecord::Errors".underscore # => active_record/errors
-  def underscore(camel_cased_word)
-    camel_cased_word.to_s.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
-  end
-
-  # Replaces underscores with dashes in the string.
-  #
-  # Example:
-  #   "puni_puni" # => "puni-puni"
-  def dasherize(underscored_word)
-    underscored_word.gsub(/_/, '-')
-  end
-
-  # Capitalizes the first word and turns underscores into spaces and strips a
-  # trailing "_id", if any. Like +titleize+, this is meant for creating pretty output.
-  #
-  # Examples:
-  #   "employee_salary" # => "Employee salary"
-  #   "author_id"       # => "Author"
-  def humanize(lower_case_and_underscored_word)
-    lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
-  end
-
-  # Removes the module part from the expression in the string.
-  #
-  # Examples:
-  #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
-  #   "Inflections".demodulize                                       # => "Inflections"
-  def demodulize(class_name_in_module)
-    class_name_in_module.to_s.gsub(/^.*::/, '')
-  end
-
-  # Create the name of a table like Rails does for models to table names. This method
-  # uses the +pluralize+ method on the last word in the string.
-  #
-  # Examples
-  #   "RawScaledScorer".tableize # => "raw_scaled_scorers"
-  #   "egg_and_ham".tableize     # => "egg_and_hams"
-  #   "fancyCategory".tableize   # => "fancy_categories"
-  def tableize(class_name)
-    pluralize(underscore(class_name))
-  end
-
-  # Create a class name from a plural table name like Rails does for table names to models.
-  # Note that this returns a string and not a Class. (To convert to an actual class
-  # follow +classify+ with +constantize+.)
-  #
-  # Examples:
-  #   "egg_and_hams".classify # => "EggAndHam"
-  #   "posts".classify        # => "Post"
-  #
-  # Singular names are not handled correctly:
-  #   "business".classify     # => "Busines"
-  def classify(table_name)
-    # strip out any leading schema name
-    camelize(singularize(table_name.to_s.sub(/.*\./, '')))
-  end
-
-  # Creates a foreign key name from a class name.
-  # +separate_class_name_and_id_with_underscore+ sets whether
-  # the method should put '_' between the name and 'id'.
-  #
-  # Examples:
-  #   "Message".foreign_key        # => "message_id"
-  #   "Message".foreign_key(false) # => "messageid"
-  #   "Admin::Post".foreign_key    # => "post_id"
-  def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
-    underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
-  end
-
-  # Tries to find a constant with the name specified in the argument string:
-  #
-  #   "Module".constantize     # => Module
-  #   "Test::Unit".constantize # => Test::Unit
-  #
-  # The name is assumed to be the one of a top-level constant, no matter whether
-  # it starts with "::" or not. No lexical context is taken into account:
-  #
-  #   C = 'outside'
-  #   module M
-  #     C = 'inside'
-  #     C               # => 'inside'
-  #     "C".constantize # => 'outside', same as ::C
-  #   end
-  #
-  # NameError is raised when the name is not in CamelCase or the constant is
-  # unknown.
-  def constantize(camel_cased_word)
-    unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
-      raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
+    # Yields a singleton instance of Inflector::Inflections so you can specify additional
+    # inflector rules.
+    #
+    # Example:
+    #   Inflector.inflections do |inflect|
+    #     inflect.uncountable "rails"
+    #   end
+    def inflections
+      if block_given?
+        yield Inflections.instance
+      else
+        Inflections.instance
+      end
     end
 
-    Object.module_eval("::#{$1}", __FILE__, __LINE__)
-  end
+    # Returns the plural form of the word in the string.
+    #
+    # Examples:
+    #   "post".pluralize             # => "posts"
+    #   "octopus".pluralize          # => "octopi"
+    #   "sheep".pluralize            # => "sheep"
+    #   "words".pluralize            # => "words"
+    #   "the blue mailman".pluralize # => "the blue mailmen"
+    #   "CamelOctopus".pluralize     # => "CamelOctopi"
+    def pluralize(word)
+      result = word.to_s.dup
 
-  # Turns a number into an ordinal string used to denote the position in an
-  # ordered sequence such as 1st, 2nd, 3rd, 4th.
-  #
-  # Examples:
-  #   ordinalize(1)     # => "1st"
-  #   ordinalize(2)     # => "2nd"
-  #   ordinalize(1002)  # => "1002nd"
-  #   ordinalize(1003)  # => "1003rd"
-  def ordinalize(number)
-    if (11..13).include?(number.to_i % 100)
-      "#{number}th"
-    else
-      case number.to_i % 10
-        when 1; "#{number}st"
-        when 2; "#{number}nd"
-        when 3; "#{number}rd"
-        else    "#{number}th"
+      if word.empty? || inflections.uncountables.include?(result.downcase)
+        result
+      else
+        inflections.plurals.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+        result
+      end
+    end
+
+    # The reverse of +pluralize+, returns the singular form of a word in a string.
+    #
+    # Examples:
+    #   "posts".singularize            # => "post"
+    #   "octopi".singularize           # => "octopus"
+    #   "sheep".singluarize            # => "sheep"
+    #   "word".singluarize             # => "word"
+    #   "the blue mailmen".singularize # => "the blue mailman"
+    #   "CamelOctopi".singularize      # => "CamelOctopus"
+    def singularize(word)
+      result = word.to_s.dup
+
+      if inflections.uncountables.include?(result.downcase)
+        result
+      else
+        inflections.singulars.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+        result
+      end
+    end
+
+    # By default, +camelize+ converts strings to UpperCamelCase. If the argument to +camelize+
+    # is set to <tt>:lower</tt> then +camelize+ produces lowerCamelCase.
+    #
+    # +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces.
+    #
+    # Examples:
+    #   "active_record".camelize                # => "ActiveRecord"
+    #   "active_record".camelize(:lower)        # => "activeRecord"
+    #   "active_record/errors".camelize         # => "ActiveRecord::Errors"
+    #   "active_record/errors".camelize(:lower) # => "activeRecord::Errors"
+    def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+      if first_letter_in_uppercase
+        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      else
+        lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
+      end
+    end
+
+    # Capitalizes all the words and replaces some characters in the string to create
+    # a nicer looking title. +titleize+ is meant for creating pretty output. It is not
+    # used in the Rails internals.
+    #
+    # +titleize+ is also aliased as as +titlecase+.
+    #
+    # Examples:
+    #   "man from the boondocks".titleize # => "Man From The Boondocks"
+    #   "x-men: the last stand".titleize  # => "X Men: The Last Stand"
+    def titleize(word)
+      humanize(underscore(word)).gsub(/\b('?[a-z])/) { $1.capitalize }
+    end
+
+    # The reverse of +camelize+. Makes an underscored, lowercase form from the expression in the string.
+    #
+    # Changes '::' to '/' to convert namespaces to paths.
+    #
+    # Examples:
+    #   "ActiveRecord".underscore         # => "active_record"
+    #   "ActiveRecord::Errors".underscore # => active_record/errors
+    def underscore(camel_cased_word)
+      camel_cased_word.to_s.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
+
+    # Replaces underscores with dashes in the string.
+    #
+    # Example:
+    #   "puni_puni" # => "puni-puni"
+    def dasherize(underscored_word)
+      underscored_word.gsub(/_/, '-')
+    end
+
+    # Capitalizes the first word and turns underscores into spaces and strips a
+    # trailing "_id", if any. Like +titleize+, this is meant for creating pretty output.
+    #
+    # Examples:
+    #   "employee_salary" # => "Employee salary"
+    #   "author_id"       # => "Author"
+    def humanize(lower_case_and_underscored_word)
+      lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
+    end
+
+    # Removes the module part from the expression in the string.
+    #
+    # Examples:
+    #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
+    #   "Inflections".demodulize                                       # => "Inflections"
+    def demodulize(class_name_in_module)
+      class_name_in_module.to_s.gsub(/^.*::/, '')
+    end
+
+    # Create the name of a table like Rails does for models to table names. This method
+    # uses the +pluralize+ method on the last word in the string.
+    #
+    # Examples
+    #   "RawScaledScorer".tableize # => "raw_scaled_scorers"
+    #   "egg_and_ham".tableize     # => "egg_and_hams"
+    #   "fancyCategory".tableize   # => "fancy_categories"
+    def tableize(class_name)
+      pluralize(underscore(class_name))
+    end
+
+    # Create a class name from a plural table name like Rails does for table names to models.
+    # Note that this returns a string and not a Class. (To convert to an actual class
+    # follow +classify+ with +constantize+.)
+    #
+    # Examples:
+    #   "egg_and_hams".classify # => "EggAndHam"
+    #   "posts".classify        # => "Post"
+    #
+    # Singular names are not handled correctly:
+    #   "business".classify     # => "Busines"
+    def classify(table_name)
+      # strip out any leading schema name
+      camelize(singularize(table_name.to_s.sub(/.*\./, '')))
+    end
+
+    # Creates a foreign key name from a class name.
+    # +separate_class_name_and_id_with_underscore+ sets whether
+    # the method should put '_' between the name and 'id'.
+    #
+    # Examples:
+    #   "Message".foreign_key        # => "message_id"
+    #   "Message".foreign_key(false) # => "messageid"
+    #   "Admin::Post".foreign_key    # => "post_id"
+    def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
+      underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
+    end
+
+    # Tries to find a constant with the name specified in the argument string:
+    #
+    #   "Module".constantize     # => Module
+    #   "Test::Unit".constantize # => Test::Unit
+    #
+    # The name is assumed to be the one of a top-level constant, no matter whether
+    # it starts with "::" or not. No lexical context is taken into account:
+    #
+    #   C = 'outside'
+    #   module M
+    #     C = 'inside'
+    #     C               # => 'inside'
+    #     "C".constantize # => 'outside', same as ::C
+    #   end
+    #
+    # NameError is raised when the name is not in CamelCase or the constant is
+    # unknown.
+    def constantize(camel_cased_word)
+      names = camel_cased_word.split('::')
+      names.shift if names.empty? || names.first.empty?
+
+      constant = Object
+      names.each do |name|
+        constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+      end
+      constant
+    end
+
+    # Turns a number into an ordinal string used to denote the position in an
+    # ordered sequence such as 1st, 2nd, 3rd, 4th.
+    #
+    # Examples:
+    #   ordinalize(1)     # => "1st"
+    #   ordinalize(2)     # => "2nd"
+    #   ordinalize(1002)  # => "1002nd"
+    #   ordinalize(1003)  # => "1003rd"
+    def ordinalize(number)
+      if (11..13).include?(number.to_i % 100)
+        "#{number}th"
+      else
+        case number.to_i % 10
+          when 1; "#{number}st"
+          when 2; "#{number}nd"
+          when 3; "#{number}rd"
+          else    "#{number}th"
+        end
       end
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb
index d41c3e97..a4a5efbf 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb
@@ -8,7 +8,7 @@ class DateTime
     if ActiveSupport.use_standard_json_time_format
       xmlschema.inspect
     else
-      %("#{strftime("%Y/%m/%d %H:%M:%S %z")}")
+      strftime('"%Y/%m/%d %H:%M:%S %z"')
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/ordered_options.rb b/vendor/rails/activesupport/lib/active_support/ordered_options.rb
index 306376e9..64204518 100644
--- a/vendor/rails/activesupport/lib/active_support/ordered_options.rb
+++ b/vendor/rails/activesupport/lib/active_support/ordered_options.rb
@@ -1,17 +1,19 @@
-class OrderedOptions < ActiveSupport::OrderedHash #:nodoc:
-  def []=(key, value)
-    super(key.to_sym, value)
-  end
+module ActiveSupport #:nodoc:
+  class OrderedOptions < OrderedHash #:nodoc:
+    def []=(key, value)
+      super(key.to_sym, value)
+    end
 
-  def [](key)
-    super(key.to_sym)
-  end
+    def [](key)
+      super(key.to_sym)
+    end
 
-  def method_missing(name, *args)
-    if name.to_s =~ /(.*)=$/
-      self[$1.to_sym] = args.first
-    else
-      self[name]
+    def method_missing(name, *args)
+      if name.to_s =~ /(.*)=$/
+        self[$1.to_sym] = args.first
+      else
+        self[name]
+      end
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/string_inquirer.rb b/vendor/rails/activesupport/lib/active_support/string_inquirer.rb
new file mode 100644
index 00000000..65545748
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/string_inquirer.rb
@@ -0,0 +1,11 @@
+module ActiveSupport
+  class StringInquirer < String
+    def method_missing(method_name, *arguments)
+      if method_name.to_s.ends_with?("?")
+        self == method_name.to_s[0..-2]
+      else
+        super
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/time_with_zone.rb b/vendor/rails/activesupport/lib/active_support/time_with_zone.rb
index bfc5b160..e85bfe9b 100644
--- a/vendor/rails/activesupport/lib/active_support/time_with_zone.rb
+++ b/vendor/rails/activesupport/lib/active_support/time_with_zone.rb
@@ -159,19 +159,24 @@ module ActiveSupport
       utc == other
     end
     
-    # If wrapped +time+ is a DateTime, use DateTime#since instead of <tt>+</tt>.
-    # Otherwise, just pass on to +method_missing+.
     def +(other)
-      result = utc.acts_like?(:date) ? utc.since(other) : utc + other rescue utc.since(other)
-      result.in_time_zone(time_zone)
+      # If we're adding a Duration of variable length (i.e., years, months, days), move forward from #time,
+      # otherwise move forward from #utc, for accuracy when moving across DST boundaries
+      if duration_of_variable_length?(other)
+        method_missing(:+, other)
+      else
+        result = utc.acts_like?(:date) ? utc.since(other) : utc + other rescue utc.since(other)
+        result.in_time_zone(time_zone)
+      end
     end
-    
-    # If a time-like object is passed in, compare it with +utc+.
-    # Else if wrapped +time+ is a DateTime, use DateTime#ago instead of DateTime#-.
-    # Otherwise, just pass on to +method_missing+.
+
     def -(other)
+      # If we're subtracting a Duration of variable length (i.e., years, months, days), move backwards from #time,
+      # otherwise move backwards #utc, for accuracy when moving across DST boundaries
       if other.acts_like?(:time)
         utc - other
+      elsif duration_of_variable_length?(other)
+        method_missing(:-, other)
       else
         result = utc.acts_like?(:date) ? utc.ago(other) : utc - other rescue utc.ago(other)
         result.in_time_zone(time_zone)
@@ -179,15 +184,27 @@ module ActiveSupport
     end
     
     def since(other)
-      utc.since(other).in_time_zone(time_zone)
+      # If we're adding a Duration of variable length (i.e., years, months, days), move forward from #time,
+      # otherwise move forward from #utc, for accuracy when moving across DST boundaries
+      if duration_of_variable_length?(other)
+        method_missing(:since, other)
+      else
+        utc.since(other).in_time_zone(time_zone)
+      end
     end
     
     def ago(other)
-      utc.ago(other).in_time_zone(time_zone)
+      since(-other)
     end
-    
+
     def advance(options)
-      utc.advance(options).in_time_zone(time_zone)
+      # If we're advancing a value of variable length (i.e., years, weeks, months, days), advance from #time,
+      # otherwise advance from #utc, for accuracy when moving across DST boundaries
+      if options.detect {|k,v| [:years, :weeks, :months, :days].include? k}
+        method_missing(:advance, options)
+      else
+        utc.advance(options).in_time_zone(time_zone)
+      end
     end
     
     %w(year mon month day mday hour min sec).each do |method_name|
@@ -246,7 +263,7 @@ module ActiveSupport
     end
     
     def marshal_load(variables)
-      initialize(variables[0], ::Time.send!(:get_zone, variables[1]), variables[2])
+      initialize(variables[0].utc, ::Time.send!(:get_zone, variables[1]), variables[2].utc)
     end
 
     # Ensure proxy class responds to all methods that underlying time instance responds to.
@@ -279,5 +296,9 @@ module ActiveSupport
       def transfer_time_values_to_utc_constructor(time)
         ::Time.utc_time(time.year, time.month, time.day, time.hour, time.min, time.sec, time.respond_to?(:usec) ? time.usec : 0)
       end
+      
+      def duration_of_variable_length?(obj)
+        ActiveSupport::Duration === obj && obj.parts.flatten.detect {|p| [:years, :months, :days].include? p }
+      end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/values/time_zone.rb b/vendor/rails/activesupport/lib/active_support/values/time_zone.rb
index a71c819f..5b2d42aa 100644
--- a/vendor/rails/activesupport/lib/active_support/values/time_zone.rb
+++ b/vendor/rails/activesupport/lib/active_support/values/time_zone.rb
@@ -4,7 +4,7 @@
 # * Retrieve and display zones with a friendlier name (e.g., "Eastern Time (US & Canada)" instead of "America/New_York").
 # * Lazily load TZInfo::Timezone instances only when they're needed.
 # * Create ActiveSupport::TimeWithZone instances via TimeZone's +local+, +parse+, +at+ and +now+ methods.
-# 
+#
 # If you set <tt>config.time_zone</tt> in the Rails Initializer, you can access this TimeZone object via <tt>Time.zone</tt>:
 #
 #   # environment.rb:
@@ -16,379 +16,381 @@
 #   Time.zone.name  # => "Eastern Time (US & Canada)"
 #   Time.zone.now   # => Sun, 18 May 2008 14:30:44 EDT -04:00
 #
-# The version of TZInfo bundled with Active Support only includes the definitions necessary to support the zones 
+# The version of TZInfo bundled with Active Support only includes the definitions necessary to support the zones
 # defined by the TimeZone class. If you need to use zones that aren't defined by TimeZone, you'll need to install the TZInfo gem
 # (if a recent version of the gem is installed locally, this will be used instead of the bundled version.)
-class TimeZone
-  unless const_defined?(:MAPPING)
-    # Keys are Rails TimeZone names, values are TZInfo identifiers
-    MAPPING = {
-      "International Date Line West" => "Pacific/Midway",
-      "Midway Island"                => "Pacific/Midway",
-      "Samoa"                        => "Pacific/Pago_Pago",
-      "Hawaii"                       => "Pacific/Honolulu",
-      "Alaska"                       => "America/Juneau",
-      "Pacific Time (US & Canada)"   => "America/Los_Angeles",
-      "Tijuana"                      => "America/Tijuana",
-      "Mountain Time (US & Canada)"  => "America/Denver",
-      "Arizona"                      => "America/Phoenix",
-      "Chihuahua"                    => "America/Chihuahua",
-      "Mazatlan"                     => "America/Mazatlan",
-      "Central Time (US & Canada)"   => "America/Chicago",
-      "Saskatchewan"                 => "America/Regina",
-      "Guadalajara"                  => "America/Mexico_City",
-      "Mexico City"                  => "America/Mexico_City",
-      "Monterrey"                    => "America/Monterrey",
-      "Central America"              => "America/Guatemala",
-      "Eastern Time (US & Canada)"   => "America/New_York",
-      "Indiana (East)"               => "America/Indiana/Indianapolis",
-      "Bogota"                       => "America/Bogota",
-      "Lima"                         => "America/Lima",
-      "Quito"                        => "America/Lima",
-      "Atlantic Time (Canada)"       => "America/Halifax",
-      "Caracas"                      => "America/Caracas",
-      "La Paz"                       => "America/La_Paz",
-      "Santiago"                     => "America/Santiago",
-      "Newfoundland"                 => "America/St_Johns",
-      "Brasilia"                     => "America/Argentina/Buenos_Aires",
-      "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
-      "Georgetown"                   => "America/Argentina/San_Juan",
-      "Greenland"                    => "America/Godthab",
-      "Mid-Atlantic"                 => "Atlantic/South_Georgia",
-      "Azores"                       => "Atlantic/Azores",
-      "Cape Verde Is."               => "Atlantic/Cape_Verde",
-      "Dublin"                       => "Europe/Dublin",
-      "Edinburgh"                    => "Europe/Dublin",
-      "Lisbon"                       => "Europe/Lisbon",
-      "London"                       => "Europe/London",
-      "Casablanca"                   => "Africa/Casablanca",
-      "Monrovia"                     => "Africa/Monrovia",
-      "UTC"                          => "Etc/UTC",
-      "Belgrade"                     => "Europe/Belgrade",
-      "Bratislava"                   => "Europe/Bratislava",
-      "Budapest"                     => "Europe/Budapest",
-      "Ljubljana"                    => "Europe/Ljubljana",
-      "Prague"                       => "Europe/Prague",
-      "Sarajevo"                     => "Europe/Sarajevo",
-      "Skopje"                       => "Europe/Skopje",
-      "Warsaw"                       => "Europe/Warsaw",
-      "Zagreb"                       => "Europe/Zagreb",
-      "Brussels"                     => "Europe/Brussels",
-      "Copenhagen"                   => "Europe/Copenhagen",
-      "Madrid"                       => "Europe/Madrid",
-      "Paris"                        => "Europe/Paris",
-      "Amsterdam"                    => "Europe/Amsterdam",
-      "Berlin"                       => "Europe/Berlin",
-      "Bern"                         => "Europe/Berlin",
-      "Rome"                         => "Europe/Rome",
-      "Stockholm"                    => "Europe/Stockholm",
-      "Vienna"                       => "Europe/Vienna",
-      "West Central Africa"          => "Africa/Algiers",
-      "Bucharest"                    => "Europe/Bucharest",
-      "Cairo"                        => "Africa/Cairo",
-      "Helsinki"                     => "Europe/Helsinki",
-      "Kyev"                         => "Europe/Kiev",
-      "Riga"                         => "Europe/Riga",
-      "Sofia"                        => "Europe/Sofia",
-      "Tallinn"                      => "Europe/Tallinn",
-      "Vilnius"                      => "Europe/Vilnius",
-      "Athens"                       => "Europe/Athens",
-      "Istanbul"                     => "Europe/Istanbul",
-      "Minsk"                        => "Europe/Minsk",
-      "Jerusalem"                    => "Asia/Jerusalem",
-      "Harare"                       => "Africa/Harare",
-      "Pretoria"                     => "Africa/Johannesburg",
-      "Moscow"                       => "Europe/Moscow",
-      "St. Petersburg"               => "Europe/Moscow",
-      "Volgograd"                    => "Europe/Moscow",
-      "Kuwait"                       => "Asia/Kuwait",
-      "Riyadh"                       => "Asia/Riyadh",
-      "Nairobi"                      => "Africa/Nairobi",
-      "Baghdad"                      => "Asia/Baghdad",
-      "Tehran"                       => "Asia/Tehran",
-      "Abu Dhabi"                    => "Asia/Muscat",
-      "Muscat"                       => "Asia/Muscat",
-      "Baku"                         => "Asia/Baku",
-      "Tbilisi"                      => "Asia/Tbilisi",
-      "Yerevan"                      => "Asia/Yerevan",
-      "Kabul"                        => "Asia/Kabul",
-      "Ekaterinburg"                 => "Asia/Yekaterinburg",
-      "Islamabad"                    => "Asia/Karachi",
-      "Karachi"                      => "Asia/Karachi",
-      "Tashkent"                     => "Asia/Tashkent",
-      "Chennai"                      => "Asia/Kolkata",
-      "Kolkata"                      => "Asia/Kolkata",
-      "Mumbai"                       => "Asia/Kolkata",
-      "New Delhi"                    => "Asia/Kolkata",
-      "Kathmandu"                    => "Asia/Katmandu",
-      "Astana"                       => "Asia/Dhaka",
-      "Dhaka"                        => "Asia/Dhaka",
-      "Sri Jayawardenepura"          => "Asia/Dhaka",
-      "Almaty"                       => "Asia/Almaty",
-      "Novosibirsk"                  => "Asia/Novosibirsk",
-      "Rangoon"                      => "Asia/Rangoon",
-      "Bangkok"                      => "Asia/Bangkok",
-      "Hanoi"                        => "Asia/Bangkok",
-      "Jakarta"                      => "Asia/Jakarta",
-      "Krasnoyarsk"                  => "Asia/Krasnoyarsk",
-      "Beijing"                      => "Asia/Shanghai",
-      "Chongqing"                    => "Asia/Chongqing",
-      "Hong Kong"                    => "Asia/Hong_Kong",
-      "Urumqi"                       => "Asia/Urumqi",
-      "Kuala Lumpur"                 => "Asia/Kuala_Lumpur",
-      "Singapore"                    => "Asia/Singapore",
-      "Taipei"                       => "Asia/Taipei",
-      "Perth"                        => "Australia/Perth",
-      "Irkutsk"                      => "Asia/Irkutsk",
-      "Ulaan Bataar"                 => "Asia/Ulaanbaatar",
-      "Seoul"                        => "Asia/Seoul",
-      "Osaka"                        => "Asia/Tokyo",
-      "Sapporo"                      => "Asia/Tokyo",
-      "Tokyo"                        => "Asia/Tokyo",
-      "Yakutsk"                      => "Asia/Yakutsk",
-      "Darwin"                       => "Australia/Darwin",
-      "Adelaide"                     => "Australia/Adelaide",
-      "Canberra"                     => "Australia/Melbourne",
-      "Melbourne"                    => "Australia/Melbourne",
-      "Sydney"                       => "Australia/Sydney",
-      "Brisbane"                     => "Australia/Brisbane",
-      "Hobart"                       => "Australia/Hobart",
-      "Vladivostok"                  => "Asia/Vladivostok",
-      "Guam"                         => "Pacific/Guam",
-      "Port Moresby"                 => "Pacific/Port_Moresby",
-      "Magadan"                      => "Asia/Magadan",
-      "Solomon Is."                  => "Asia/Magadan",
-      "New Caledonia"                => "Pacific/Noumea",
-      "Fiji"                         => "Pacific/Fiji",
-      "Kamchatka"                    => "Asia/Kamchatka",
-      "Marshall Is."                 => "Pacific/Majuro",
-      "Auckland"                     => "Pacific/Auckland",
-      "Wellington"                   => "Pacific/Auckland",
-      "Nuku'alofa"                   => "Pacific/Tongatapu"
-    }.each { |name, zone| name.freeze; zone.freeze }
-    MAPPING.freeze
-  end
+module ActiveSupport
+  class TimeZone
+    unless const_defined?(:MAPPING)
+      # Keys are Rails TimeZone names, values are TZInfo identifiers
+      MAPPING = {
+        "International Date Line West" => "Pacific/Midway",
+        "Midway Island"                => "Pacific/Midway",
+        "Samoa"                        => "Pacific/Pago_Pago",
+        "Hawaii"                       => "Pacific/Honolulu",
+        "Alaska"                       => "America/Juneau",
+        "Pacific Time (US & Canada)"   => "America/Los_Angeles",
+        "Tijuana"                      => "America/Tijuana",
+        "Mountain Time (US & Canada)"  => "America/Denver",
+        "Arizona"                      => "America/Phoenix",
+        "Chihuahua"                    => "America/Chihuahua",
+        "Mazatlan"                     => "America/Mazatlan",
+        "Central Time (US & Canada)"   => "America/Chicago",
+        "Saskatchewan"                 => "America/Regina",
+        "Guadalajara"                  => "America/Mexico_City",
+        "Mexico City"                  => "America/Mexico_City",
+        "Monterrey"                    => "America/Monterrey",
+        "Central America"              => "America/Guatemala",
+        "Eastern Time (US & Canada)"   => "America/New_York",
+        "Indiana (East)"               => "America/Indiana/Indianapolis",
+        "Bogota"                       => "America/Bogota",
+        "Lima"                         => "America/Lima",
+        "Quito"                        => "America/Lima",
+        "Atlantic Time (Canada)"       => "America/Halifax",
+        "Caracas"                      => "America/Caracas",
+        "La Paz"                       => "America/La_Paz",
+        "Santiago"                     => "America/Santiago",
+        "Newfoundland"                 => "America/St_Johns",
+        "Brasilia"                     => "America/Argentina/Buenos_Aires",
+        "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
+        "Georgetown"                   => "America/Argentina/San_Juan",
+        "Greenland"                    => "America/Godthab",
+        "Mid-Atlantic"                 => "Atlantic/South_Georgia",
+        "Azores"                       => "Atlantic/Azores",
+        "Cape Verde Is."               => "Atlantic/Cape_Verde",
+        "Dublin"                       => "Europe/Dublin",
+        "Edinburgh"                    => "Europe/Dublin",
+        "Lisbon"                       => "Europe/Lisbon",
+        "London"                       => "Europe/London",
+        "Casablanca"                   => "Africa/Casablanca",
+        "Monrovia"                     => "Africa/Monrovia",
+        "UTC"                          => "Etc/UTC",
+        "Belgrade"                     => "Europe/Belgrade",
+        "Bratislava"                   => "Europe/Bratislava",
+        "Budapest"                     => "Europe/Budapest",
+        "Ljubljana"                    => "Europe/Ljubljana",
+        "Prague"                       => "Europe/Prague",
+        "Sarajevo"                     => "Europe/Sarajevo",
+        "Skopje"                       => "Europe/Skopje",
+        "Warsaw"                       => "Europe/Warsaw",
+        "Zagreb"                       => "Europe/Zagreb",
+        "Brussels"                     => "Europe/Brussels",
+        "Copenhagen"                   => "Europe/Copenhagen",
+        "Madrid"                       => "Europe/Madrid",
+        "Paris"                        => "Europe/Paris",
+        "Amsterdam"                    => "Europe/Amsterdam",
+        "Berlin"                       => "Europe/Berlin",
+        "Bern"                         => "Europe/Berlin",
+        "Rome"                         => "Europe/Rome",
+        "Stockholm"                    => "Europe/Stockholm",
+        "Vienna"                       => "Europe/Vienna",
+        "West Central Africa"          => "Africa/Algiers",
+        "Bucharest"                    => "Europe/Bucharest",
+        "Cairo"                        => "Africa/Cairo",
+        "Helsinki"                     => "Europe/Helsinki",
+        "Kyev"                         => "Europe/Kiev",
+        "Riga"                         => "Europe/Riga",
+        "Sofia"                        => "Europe/Sofia",
+        "Tallinn"                      => "Europe/Tallinn",
+        "Vilnius"                      => "Europe/Vilnius",
+        "Athens"                       => "Europe/Athens",
+        "Istanbul"                     => "Europe/Istanbul",
+        "Minsk"                        => "Europe/Minsk",
+        "Jerusalem"                    => "Asia/Jerusalem",
+        "Harare"                       => "Africa/Harare",
+        "Pretoria"                     => "Africa/Johannesburg",
+        "Moscow"                       => "Europe/Moscow",
+        "St. Petersburg"               => "Europe/Moscow",
+        "Volgograd"                    => "Europe/Moscow",
+        "Kuwait"                       => "Asia/Kuwait",
+        "Riyadh"                       => "Asia/Riyadh",
+        "Nairobi"                      => "Africa/Nairobi",
+        "Baghdad"                      => "Asia/Baghdad",
+        "Tehran"                       => "Asia/Tehran",
+        "Abu Dhabi"                    => "Asia/Muscat",
+        "Muscat"                       => "Asia/Muscat",
+        "Baku"                         => "Asia/Baku",
+        "Tbilisi"                      => "Asia/Tbilisi",
+        "Yerevan"                      => "Asia/Yerevan",
+        "Kabul"                        => "Asia/Kabul",
+        "Ekaterinburg"                 => "Asia/Yekaterinburg",
+        "Islamabad"                    => "Asia/Karachi",
+        "Karachi"                      => "Asia/Karachi",
+        "Tashkent"                     => "Asia/Tashkent",
+        "Chennai"                      => "Asia/Kolkata",
+        "Kolkata"                      => "Asia/Kolkata",
+        "Mumbai"                       => "Asia/Kolkata",
+        "New Delhi"                    => "Asia/Kolkata",
+        "Kathmandu"                    => "Asia/Katmandu",
+        "Astana"                       => "Asia/Dhaka",
+        "Dhaka"                        => "Asia/Dhaka",
+        "Sri Jayawardenepura"          => "Asia/Dhaka",
+        "Almaty"                       => "Asia/Almaty",
+        "Novosibirsk"                  => "Asia/Novosibirsk",
+        "Rangoon"                      => "Asia/Rangoon",
+        "Bangkok"                      => "Asia/Bangkok",
+        "Hanoi"                        => "Asia/Bangkok",
+        "Jakarta"                      => "Asia/Jakarta",
+        "Krasnoyarsk"                  => "Asia/Krasnoyarsk",
+        "Beijing"                      => "Asia/Shanghai",
+        "Chongqing"                    => "Asia/Chongqing",
+        "Hong Kong"                    => "Asia/Hong_Kong",
+        "Urumqi"                       => "Asia/Urumqi",
+        "Kuala Lumpur"                 => "Asia/Kuala_Lumpur",
+        "Singapore"                    => "Asia/Singapore",
+        "Taipei"                       => "Asia/Taipei",
+        "Perth"                        => "Australia/Perth",
+        "Irkutsk"                      => "Asia/Irkutsk",
+        "Ulaan Bataar"                 => "Asia/Ulaanbaatar",
+        "Seoul"                        => "Asia/Seoul",
+        "Osaka"                        => "Asia/Tokyo",
+        "Sapporo"                      => "Asia/Tokyo",
+        "Tokyo"                        => "Asia/Tokyo",
+        "Yakutsk"                      => "Asia/Yakutsk",
+        "Darwin"                       => "Australia/Darwin",
+        "Adelaide"                     => "Australia/Adelaide",
+        "Canberra"                     => "Australia/Melbourne",
+        "Melbourne"                    => "Australia/Melbourne",
+        "Sydney"                       => "Australia/Sydney",
+        "Brisbane"                     => "Australia/Brisbane",
+        "Hobart"                       => "Australia/Hobart",
+        "Vladivostok"                  => "Asia/Vladivostok",
+        "Guam"                         => "Pacific/Guam",
+        "Port Moresby"                 => "Pacific/Port_Moresby",
+        "Magadan"                      => "Asia/Magadan",
+        "Solomon Is."                  => "Asia/Magadan",
+        "New Caledonia"                => "Pacific/Noumea",
+        "Fiji"                         => "Pacific/Fiji",
+        "Kamchatka"                    => "Asia/Kamchatka",
+        "Marshall Is."                 => "Pacific/Majuro",
+        "Auckland"                     => "Pacific/Auckland",
+        "Wellington"                   => "Pacific/Auckland",
+        "Nuku'alofa"                   => "Pacific/Tongatapu"
+      }.each { |name, zone| name.freeze; zone.freeze }
+      MAPPING.freeze
+    end
 
-  include Comparable
-  attr_reader :name
+    include Comparable
+    attr_reader :name
 
-  # Create a new TimeZone object with the given name and offset. The
-  # offset is the number of seconds that this time zone is offset from UTC
-  # (GMT). Seconds were chosen as the offset unit because that is the unit that
-  # Ruby uses to represent time zone offsets (see Time#utc_offset).
-  def initialize(name, utc_offset, tzinfo = nil)
-    @name = name
-    @utc_offset = utc_offset
-    @tzinfo = tzinfo
-  end
+    # Create a new TimeZone object with the given name and offset. The
+    # offset is the number of seconds that this time zone is offset from UTC
+    # (GMT). Seconds were chosen as the offset unit because that is the unit that
+    # Ruby uses to represent time zone offsets (see Time#utc_offset).
+    def initialize(name, utc_offset, tzinfo = nil)
+      @name = name
+      @utc_offset = utc_offset
+      @tzinfo = tzinfo
+    end
 
-  def utc_offset
-    @utc_offset ||= tzinfo.current_period.utc_offset
-  end
+    def utc_offset
+      @utc_offset ||= tzinfo.current_period.utc_offset
+    end
 
-  # Returns the offset of this time zone as a formatted string, of the
-  # format "+HH:MM".
-  def formatted_offset(colon=true, alternate_utc_string = nil)
-    utc_offset == 0 && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
-  end
+    # Returns the offset of this time zone as a formatted string, of the
+    # format "+HH:MM".
+    def formatted_offset(colon=true, alternate_utc_string = nil)
+      utc_offset == 0 && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
+    end
 
-  # Compare this time zone to the parameter. The two are comapred first on
-  # their offsets, and then by name.
-  def <=>(zone)
-    result = (utc_offset <=> zone.utc_offset)
-    result = (name <=> zone.name) if result == 0
-    result
-  end
+    # Compare this time zone to the parameter. The two are comapred first on
+    # their offsets, and then by name.
+    def <=>(zone)
+      result = (utc_offset <=> zone.utc_offset)
+      result = (name <=> zone.name) if result == 0
+      result
+    end
 
-  # Returns a textual representation of this time zone.
-  def to_s
-    "(GMT#{formatted_offset}) #{name}"
-  end
+    # Returns a textual representation of this time zone.
+    def to_s
+      "(GMT#{formatted_offset}) #{name}"
+    end
 
-  # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from given values. Example:
-  #
-  #   Time.zone = "Hawaii"                      # => "Hawaii"
-  #   Time.zone.local(2007, 2, 1, 15, 30, 45)   # => Thu, 01 Feb 2007 15:30:45 HST -10:00
-  def local(*args)
-    time = Time.utc_time(*args)
-    ActiveSupport::TimeWithZone.new(nil, self, time)
-  end
-
-  # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from number of seconds since the Unix epoch. Example:
-  #
-  #   Time.zone = "Hawaii"        # => "Hawaii"
-  #   Time.utc(2000).to_f         # => 946684800.0
-  #   Time.zone.at(946684800.0)   # => Fri, 31 Dec 1999 14:00:00 HST -10:00
-  def at(secs)
-    utc = Time.at(secs).utc rescue DateTime.civil(1970).since(secs)
-    utc.in_time_zone(self)
-  end
-
-  # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from parsed string. Example:
-  #
-  #   Time.zone = "Hawaii"                      # => "Hawaii"
-  #   Time.zone.parse('1999-12-31 14:00:00')    # => Fri, 31 Dec 1999 14:00:00 HST -10:00
-  #
-  # If upper components are missing from the string, they are supplied from TimeZone#now:
-  #
-  #   Time.zone.now                 # => Fri, 31 Dec 1999 14:00:00 HST -10:00
-  #   Time.zone.parse('22:30:00')   # => Fri, 31 Dec 1999 22:30:00 HST -10:00
-  def parse(str, now=now)
-    date_parts = Date._parse(str)
-    return if date_parts.blank?
-    time = Time.parse(str, now) rescue DateTime.parse(str)
-    if date_parts[:offset].nil?
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from given values. Example:
+    #
+    #   Time.zone = "Hawaii"                      # => "Hawaii"
+    #   Time.zone.local(2007, 2, 1, 15, 30, 45)   # => Thu, 01 Feb 2007 15:30:45 HST -10:00
+    def local(*args)
+      time = Time.utc_time(*args)
       ActiveSupport::TimeWithZone.new(nil, self, time)
-    else
-      time.in_time_zone(self)
-    end
-  end
-
-  # Returns an ActiveSupport::TimeWithZone instance representing the current time
-  # in the time zone represented by +self+. Example:
-  #
-  #   Time.zone = 'Hawaii'  # => "Hawaii"
-  #   Time.zone.now         # => Wed, 23 Jan 2008 20:24:27 HST -10:00
-  def now
-    Time.now.utc.in_time_zone(self)
-  end
-
-  # Return the current date in this time zone.
-  def today
-    tzinfo.now.to_date
-  end
-
-  # Adjust the given time to the simultaneous time in the time zone represented by +self+. Returns a
-  # Time.utc() instance -- if you want an ActiveSupport::TimeWithZone instance, use Time#in_time_zone() instead.
-  def utc_to_local(time)
-    tzinfo.utc_to_local(time)
-  end
-
-  # Adjust the given time to the simultaneous time in UTC. Returns a Time.utc() instance.
-  def local_to_utc(time, dst=true)
-    tzinfo.local_to_utc(time, dst)
-  end
-
-  # Available so that TimeZone instances respond like TZInfo::Timezone instances
-  def period_for_utc(time)
-    tzinfo.period_for_utc(time)
-  end
-
-  # Available so that TimeZone instances respond like TZInfo::Timezone instances
-  def period_for_local(time, dst=true)
-    tzinfo.period_for_local(time, dst)
-  end
-
-  # TODO: Preload instead of lazy load for thread safety
-  def tzinfo
-    @tzinfo ||= TZInfo::Timezone.get(MAPPING[name])
-  end
-
-  unless const_defined?(:ZONES)
-    ZONES = []
-    ZONES_MAP = {}
-    [[-39_600, "International Date Line West", "Midway Island", "Samoa" ],
-     [-36_000, "Hawaii" ],
-     [-32_400, "Alaska" ],
-     [-28_800, "Pacific Time (US & Canada)", "Tijuana" ],
-     [-25_200, "Mountain Time (US & Canada)", "Chihuahua", "Mazatlan",
-               "Arizona" ],
-     [-21_600, "Central Time (US & Canada)", "Saskatchewan", "Guadalajara",
-               "Mexico City", "Monterrey", "Central America" ],
-     [-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota",
-               "Lima", "Quito" ],
-     [-14_400, "Atlantic Time (Canada)", "Caracas", "La Paz", "Santiago" ],
-     [-12_600, "Newfoundland" ],
-     [-10_800, "Brasilia", "Buenos Aires", "Georgetown", "Greenland" ],
-     [ -7_200, "Mid-Atlantic" ],
-     [ -3_600, "Azores", "Cape Verde Is." ],
-     [      0, "Dublin", "Edinburgh", "Lisbon", "London", "Casablanca",
-               "Monrovia", "UTC" ],
-     [  3_600, "Belgrade", "Bratislava", "Budapest", "Ljubljana", "Prague",
-               "Sarajevo", "Skopje", "Warsaw", "Zagreb", "Brussels",
-               "Copenhagen", "Madrid", "Paris", "Amsterdam", "Berlin",
-               "Bern", "Rome", "Stockholm", "Vienna",
-               "West Central Africa" ],
-     [  7_200, "Bucharest", "Cairo", "Helsinki", "Kyev", "Riga", "Sofia",
-               "Tallinn", "Vilnius", "Athens", "Istanbul", "Minsk",
-               "Jerusalem", "Harare", "Pretoria" ],
-     [ 10_800, "Moscow", "St. Petersburg", "Volgograd", "Kuwait", "Riyadh",
-               "Nairobi", "Baghdad" ],
-     [ 12_600, "Tehran" ],
-     [ 14_400, "Abu Dhabi", "Muscat", "Baku", "Tbilisi", "Yerevan" ],
-     [ 16_200, "Kabul" ],
-     [ 18_000, "Ekaterinburg", "Islamabad", "Karachi", "Tashkent" ],
-     [ 19_800, "Chennai", "Kolkata", "Mumbai", "New Delhi" ],
-     [ 20_700, "Kathmandu" ],
-     [ 21_600, "Astana", "Dhaka", "Sri Jayawardenepura", "Almaty",
-               "Novosibirsk" ],
-     [ 23_400, "Rangoon" ],
-     [ 25_200, "Bangkok", "Hanoi", "Jakarta", "Krasnoyarsk" ],
-     [ 28_800, "Beijing", "Chongqing", "Hong Kong", "Urumqi",
-               "Kuala Lumpur", "Singapore", "Taipei", "Perth", "Irkutsk",
-               "Ulaan Bataar" ],
-     [ 32_400, "Seoul", "Osaka", "Sapporo", "Tokyo", "Yakutsk" ],
-     [ 34_200, "Darwin", "Adelaide" ],
-     [ 36_000, "Canberra", "Melbourne", "Sydney", "Brisbane", "Hobart",
-               "Vladivostok", "Guam", "Port Moresby" ],
-     [ 39_600, "Magadan", "Solomon Is.", "New Caledonia" ],
-     [ 43_200, "Fiji", "Kamchatka", "Marshall Is.", "Auckland",
-               "Wellington" ],
-     [ 46_800, "Nuku'alofa" ]].
-    each do |offset, *places|
-      places.each do |place|
-        place.freeze
-        zone = new(place, offset)
-        ZONES << zone
-        ZONES_MAP[place] = zone
-      end
-    end
-    ZONES.sort!
-    ZONES.freeze
-    ZONES_MAP.freeze
-
-    US_ZONES = ZONES.find_all { |z| z.name =~ /US|Arizona|Indiana|Hawaii|Alaska/ }
-    US_ZONES.freeze
-  end
-
-  class << self
-    alias_method :create, :new
-
-    # Return a TimeZone instance with the given name, or +nil+ if no
-    # such TimeZone instance exists. (This exists to support the use of
-    # this class with the +composed_of+ macro.)
-    def new(name)
-      self[name]
     end
 
-    # Return an array of all TimeZone objects. There are multiple
-    # TimeZone objects per time zone, in many cases, to make it easier
-    # for users to find their own time zone.
-    def all
-      ZONES
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from number of seconds since the Unix epoch. Example:
+    #
+    #   Time.zone = "Hawaii"        # => "Hawaii"
+    #   Time.utc(2000).to_f         # => 946684800.0
+    #   Time.zone.at(946684800.0)   # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+    def at(secs)
+      utc = Time.at(secs).utc rescue DateTime.civil(1970).since(secs)
+      utc.in_time_zone(self)
     end
 
-    # Locate a specific time zone object. If the argument is a string, it
-    # is interpreted to mean the name of the timezone to locate. If it is a
-    # numeric value it is either the hour offset, or the second offset, of the
-    # timezone to find. (The first one with that offset will be returned.)
-    # Returns +nil+ if no such time zone is known to the system.
-    def [](arg)
-      case arg
-        when String
-          ZONES_MAP[arg]
-        when Numeric, ActiveSupport::Duration
-          arg *= 3600 if arg.abs <= 13
-          all.find { |z| z.utc_offset == arg.to_i }
-        else
-          raise ArgumentError, "invalid argument to TimeZone[]: #{arg.inspect}"
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from parsed string. Example:
+    #
+    #   Time.zone = "Hawaii"                      # => "Hawaii"
+    #   Time.zone.parse('1999-12-31 14:00:00')    # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+    #
+    # If upper components are missing from the string, they are supplied from TimeZone#now:
+    #
+    #   Time.zone.now                 # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+    #   Time.zone.parse('22:30:00')   # => Fri, 31 Dec 1999 22:30:00 HST -10:00
+    def parse(str, now=now)
+      date_parts = Date._parse(str)
+      return if date_parts.blank?
+      time = Time.parse(str, now) rescue DateTime.parse(str)
+      if date_parts[:offset].nil?
+        ActiveSupport::TimeWithZone.new(nil, self, time)
+      else
+        time.in_time_zone(self)
       end
     end
 
-    # A convenience method for returning a collection of TimeZone objects
-    # for time zones in the USA.
-    def us_zones
-      US_ZONES
+    # Returns an ActiveSupport::TimeWithZone instance representing the current time
+    # in the time zone represented by +self+. Example:
+    #
+    #   Time.zone = 'Hawaii'  # => "Hawaii"
+    #   Time.zone.now         # => Wed, 23 Jan 2008 20:24:27 HST -10:00
+    def now
+      Time.now.utc.in_time_zone(self)
+    end
+
+    # Return the current date in this time zone.
+    def today
+      tzinfo.now.to_date
+    end
+
+    # Adjust the given time to the simultaneous time in the time zone represented by +self+. Returns a
+    # Time.utc() instance -- if you want an ActiveSupport::TimeWithZone instance, use Time#in_time_zone() instead.
+    def utc_to_local(time)
+      tzinfo.utc_to_local(time)
+    end
+
+    # Adjust the given time to the simultaneous time in UTC. Returns a Time.utc() instance.
+    def local_to_utc(time, dst=true)
+      tzinfo.local_to_utc(time, dst)
+    end
+
+    # Available so that TimeZone instances respond like TZInfo::Timezone instances
+    def period_for_utc(time)
+      tzinfo.period_for_utc(time)
+    end
+
+    # Available so that TimeZone instances respond like TZInfo::Timezone instances
+    def period_for_local(time, dst=true)
+      tzinfo.period_for_local(time, dst)
+    end
+
+    # TODO: Preload instead of lazy load for thread safety
+    def tzinfo
+      @tzinfo ||= TZInfo::Timezone.get(MAPPING[name])
+    end
+
+    unless const_defined?(:ZONES)
+      ZONES = []
+      ZONES_MAP = {}
+      [[-39_600, "International Date Line West", "Midway Island", "Samoa" ],
+       [-36_000, "Hawaii" ],
+       [-32_400, "Alaska" ],
+       [-28_800, "Pacific Time (US & Canada)", "Tijuana" ],
+       [-25_200, "Mountain Time (US & Canada)", "Chihuahua", "Mazatlan",
+                 "Arizona" ],
+       [-21_600, "Central Time (US & Canada)", "Saskatchewan", "Guadalajara",
+                 "Mexico City", "Monterrey", "Central America" ],
+       [-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota",
+                 "Lima", "Quito" ],
+       [-14_400, "Atlantic Time (Canada)", "Caracas", "La Paz", "Santiago" ],
+       [-12_600, "Newfoundland" ],
+       [-10_800, "Brasilia", "Buenos Aires", "Georgetown", "Greenland" ],
+       [ -7_200, "Mid-Atlantic" ],
+       [ -3_600, "Azores", "Cape Verde Is." ],
+       [      0, "Dublin", "Edinburgh", "Lisbon", "London", "Casablanca",
+                 "Monrovia", "UTC" ],
+       [  3_600, "Belgrade", "Bratislava", "Budapest", "Ljubljana", "Prague",
+                 "Sarajevo", "Skopje", "Warsaw", "Zagreb", "Brussels",
+                 "Copenhagen", "Madrid", "Paris", "Amsterdam", "Berlin",
+                 "Bern", "Rome", "Stockholm", "Vienna",
+                 "West Central Africa" ],
+       [  7_200, "Bucharest", "Cairo", "Helsinki", "Kyev", "Riga", "Sofia",
+                 "Tallinn", "Vilnius", "Athens", "Istanbul", "Minsk",
+                 "Jerusalem", "Harare", "Pretoria" ],
+       [ 10_800, "Moscow", "St. Petersburg", "Volgograd", "Kuwait", "Riyadh",
+                 "Nairobi", "Baghdad" ],
+       [ 12_600, "Tehran" ],
+       [ 14_400, "Abu Dhabi", "Muscat", "Baku", "Tbilisi", "Yerevan" ],
+       [ 16_200, "Kabul" ],
+       [ 18_000, "Ekaterinburg", "Islamabad", "Karachi", "Tashkent" ],
+       [ 19_800, "Chennai", "Kolkata", "Mumbai", "New Delhi" ],
+       [ 20_700, "Kathmandu" ],
+       [ 21_600, "Astana", "Dhaka", "Sri Jayawardenepura", "Almaty",
+                 "Novosibirsk" ],
+       [ 23_400, "Rangoon" ],
+       [ 25_200, "Bangkok", "Hanoi", "Jakarta", "Krasnoyarsk" ],
+       [ 28_800, "Beijing", "Chongqing", "Hong Kong", "Urumqi",
+                 "Kuala Lumpur", "Singapore", "Taipei", "Perth", "Irkutsk",
+                 "Ulaan Bataar" ],
+       [ 32_400, "Seoul", "Osaka", "Sapporo", "Tokyo", "Yakutsk" ],
+       [ 34_200, "Darwin", "Adelaide" ],
+       [ 36_000, "Canberra", "Melbourne", "Sydney", "Brisbane", "Hobart",
+                 "Vladivostok", "Guam", "Port Moresby" ],
+       [ 39_600, "Magadan", "Solomon Is.", "New Caledonia" ],
+       [ 43_200, "Fiji", "Kamchatka", "Marshall Is.", "Auckland",
+                 "Wellington" ],
+       [ 46_800, "Nuku'alofa" ]].
+      each do |offset, *places|
+        places.each do |place|
+          place.freeze
+          zone = new(place, offset)
+          ZONES << zone
+          ZONES_MAP[place] = zone
+        end
+      end
+      ZONES.sort!
+      ZONES.freeze
+      ZONES_MAP.freeze
+
+      US_ZONES = ZONES.find_all { |z| z.name =~ /US|Arizona|Indiana|Hawaii|Alaska/ }
+      US_ZONES.freeze
+    end
+
+    class << self
+      alias_method :create, :new
+
+      # Return a TimeZone instance with the given name, or +nil+ if no
+      # such TimeZone instance exists. (This exists to support the use of
+      # this class with the +composed_of+ macro.)
+      def new(name)
+        self[name]
+      end
+
+      # Return an array of all TimeZone objects. There are multiple
+      # TimeZone objects per time zone, in many cases, to make it easier
+      # for users to find their own time zone.
+      def all
+        ZONES
+      end
+
+      # Locate a specific time zone object. If the argument is a string, it
+      # is interpreted to mean the name of the timezone to locate. If it is a
+      # numeric value it is either the hour offset, or the second offset, of the
+      # timezone to find. (The first one with that offset will be returned.)
+      # Returns +nil+ if no such time zone is known to the system.
+      def [](arg)
+        case arg
+          when String
+            ZONES_MAP[arg]
+          when Numeric, ActiveSupport::Duration
+            arg *= 3600 if arg.abs <= 13
+            all.find { |z| z.utc_offset == arg.to_i }
+          else
+            raise ArgumentError, "invalid argument to TimeZone[]: #{arg.inspect}"
+        end
+      end
+
+      # A convenience method for returning a collection of TimeZone objects
+      # for time zones in the USA.
+      def us_zones
+        US_ZONES
+      end
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor.rb b/vendor/rails/activesupport/lib/active_support/vendor.rb
index cdbcedc7..a02e42f7 100644
--- a/vendor/rails/activesupport/lib/active_support/vendor.rb
+++ b/vendor/rails/activesupport/lib/active_support/vendor.rb
@@ -20,7 +20,7 @@ rescue Gem::LoadError
 end
 
 begin
-  gem 'tzinfo', '~> 0.3.8'
+  gem 'tzinfo', '~> 0.3.9'
 rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.8"
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.9"
 end
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo.rb
new file mode 100644
index 00000000..c8bdbeec
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo.rb
@@ -0,0 +1,33 @@
+#--
+# Copyright (c) 2005-2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+# Add the directory containing this file to the start of the load path if it
+# isn't there already.
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'tzinfo/timezone'
+# require 'tzinfo/country'
+# require 'tzinfo/tzdataparser'
+# require 'tzinfo/timezone_proxy'
+require 'tzinfo/data_timezone'
+require 'tzinfo/linked_timezone'
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone.rb
new file mode 100644
index 00000000..5eccbdf0
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone.rb
@@ -0,0 +1,47 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'tzinfo/info_timezone'
+
+module TZInfo
+
+  # A Timezone based on a DataTimezoneInfo.
+  class DataTimezone < InfoTimezone #:nodoc:
+    
+    # Returns the TimezonePeriod for the given UTC time. utc can either be
+    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
+    # information in utc is ignored (it is treated as a UTC time).        
+    #
+    # If no TimezonePeriod could be found, PeriodNotFound is raised.
+    def period_for_utc(utc)
+      info.period_for_utc(utc)
+    end
+    
+    # Returns the set of TimezonePeriod instances that are valid for the given
+    # local time as an array. If you just want a single period, use 
+    # period_for_local instead and specify how abiguities should be resolved.
+    # Raises PeriodNotFound if no periods are found for the given time.
+    def periods_for_local(local)
+      info.periods_for_local(local)
+    end    
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb
new file mode 100644
index 00000000..a45d9455
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb
@@ -0,0 +1,228 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'tzinfo/time_or_datetime'
+require 'tzinfo/timezone_info'
+require 'tzinfo/timezone_offset_info'
+require 'tzinfo/timezone_period'
+require 'tzinfo/timezone_transition_info'
+
+module TZInfo
+  # Thrown if no offsets have been defined when calling period_for_utc or
+  # periods_for_local. Indicates an error in the timezone data.
+  class NoOffsetsDefined < StandardError
+  end
+    
+  # Represents a (non-linked) timezone defined in a data module.
+  class DataTimezoneInfo < TimezoneInfo #:nodoc:
+            
+    # Constructs a new TimezoneInfo with its identifier.
+    def initialize(identifier)   
+      super(identifier)
+      @offsets = {}
+      @transitions = []
+      @previous_offset = nil
+      @transitions_index = nil
+    end
+ 
+    # Defines a offset. The id uniquely identifies this offset within the
+    # timezone. utc_offset and std_offset define the offset in seconds of 
+    # standard time from UTC and daylight savings from standard time 
+    # respectively. abbreviation describes the timezone offset (e.g. GMT, BST,
+    # EST or EDT).
+    #
+    # The first offset to be defined is treated as the offset that applies
+    # until the first transition. This will usually be in Local Mean Time (LMT).
+    #
+    # ArgumentError will be raised if the id is already defined.
+    def offset(id, utc_offset, std_offset, abbreviation)
+      raise ArgumentError, 'Offset already defined' if @offsets.has_key?(id)
+      
+      offset = TimezoneOffsetInfo.new(utc_offset, std_offset, abbreviation)
+      @offsets[id] = offset
+      @previous_offset = offset unless @previous_offset
+    end
+    
+    # Defines a transition. Transitions must be defined in chronological order.
+    # ArgumentError will be raised if a transition is added out of order.
+    # offset_id refers to an id defined with offset. ArgumentError will be 
+    # raised if the offset_id cannot be found. numerator_or_time and
+    # denomiator specify the time the transition occurs as. See 
+    # TimezoneTransitionInfo for more detail about specifying times.
+    def transition(year, month, offset_id, numerator_or_time, denominator = nil)
+      offset = @offsets[offset_id]      
+      raise ArgumentError, 'Offset not found' unless offset
+            
+      if @transitions_index
+        if year < @last_year || (year == @last_year && month < @last_month)
+          raise ArgumentError, 'Transitions must be increasing date order'
+        end
+        
+        # Record the position of the first transition with this index.
+        index = transition_index(year, month)
+        @transitions_index[index] ||= @transitions.length
+                
+        # Fill in any gaps       
+        (index - 1).downto(0) do |i|
+          break if @transitions_index[i]
+          @transitions_index[i] = @transitions.length
+        end
+      else
+        @transitions_index = [@transitions.length]
+        @start_year = year
+        @start_month = month        
+      end
+      
+      @transitions << TimezoneTransitionInfo.new(offset, @previous_offset, 
+        numerator_or_time, denominator)
+      @last_year = year
+      @last_month = month             
+      @previous_offset = offset
+    end           
+    
+    # Returns the TimezonePeriod for the given UTC time.
+    # Raises NoOffsetsDefined if no offsets have been defined.
+    def period_for_utc(utc)
+      unless @transitions.empty?
+        utc = TimeOrDateTime.wrap(utc)               
+        index = transition_index(utc.year, utc.mon)
+        
+        start_transition = nil
+        start = transition_before_end(index)
+        if start
+          start.downto(0) do |i|
+            if @transitions[i].at <= utc
+              start_transition = @transitions[i]
+              break
+            end
+          end
+        end
+        
+        end_transition = nil
+        start = transition_after_start(index)      
+        if start
+          start.upto(@transitions.length - 1) do |i|
+            if @transitions[i].at > utc
+              end_transition = @transitions[i]
+              break
+            end
+          end
+        end
+               
+        if start_transition || end_transition
+          TimezonePeriod.new(start_transition, end_transition)
+        else
+          # Won't happen since there are transitions. Must always find one
+          # transition that is either >= or < the specified time.
+          raise 'No transitions found in search'
+        end        
+      else
+        raise NoOffsetsDefined, 'No offsets have been defined' unless @previous_offset        
+        TimezonePeriod.new(nil, nil, @previous_offset)
+      end
+    end
+    
+    # Returns the set of TimezonePeriods for the given local time as an array.    
+    # Results returned are ordered by increasing UTC start date.
+    # Returns an empty array if no periods are found for the given time.
+    # Raises NoOffsetsDefined if no offsets have been defined.    
+    def periods_for_local(local)
+      unless @transitions.empty?
+        local = TimeOrDateTime.wrap(local)
+        index = transition_index(local.year, local.mon)
+        
+        result = []
+       
+        start_index = transition_after_start(index - 1)       
+        if start_index && @transitions[start_index].local_end > local           
+          if start_index > 0
+            if @transitions[start_index - 1].local_start <= local 
+              result << TimezonePeriod.new(@transitions[start_index - 1], @transitions[start_index])
+            end
+          else
+            result << TimezonePeriod.new(nil, @transitions[start_index])
+          end
+        end
+        
+        end_index = transition_before_end(index + 1)
+        
+        if end_index        
+          start_index = end_index unless start_index
+          
+          start_index.upto(transition_before_end(index + 1)) do |i|
+            if @transitions[i].local_start <= local
+              if i + 1 < @transitions.length
+                if @transitions[i + 1].local_end > local
+                  result << TimezonePeriod.new(@transitions[i], @transitions[i + 1])
+                end
+              else
+                result << TimezonePeriod.new(@transitions[i], nil)
+              end
+            end
+          end
+        end
+        
+        result
+      else
+        raise NoOffsetsDefined, 'No offsets have been defined' unless @previous_offset
+        [TimezonePeriod.new(nil, nil, @previous_offset)]
+      end
+    end
+    
+    private
+      # Returns the index into the @transitions_index array for a given year 
+      # and month.
+      def transition_index(year, month)
+        index = (year - @start_year) * 2
+        index += 1 if month > 6
+        index -= 1 if @start_month > 6
+        index
+      end
+      
+      # Returns the index into @transitions of the first transition that occurs
+      # on or after the start of the given index into @transitions_index.
+      # Returns nil if there are no such transitions.
+      def transition_after_start(index)
+        if index >= @transitions_index.length
+          nil
+        else
+          index = 0 if index < 0
+          @transitions_index[index]
+        end
+      end
+      
+      # Returns the index into @transitions of the first transition that occurs
+      # before the end of the given index into @transitions_index.
+      # Returns nil if there are no such transitions.
+      def transition_before_end(index)
+        index = index + 1
+        
+        if index <= 0
+          nil
+        elsif index >= @transitions_index.length          
+          @transitions.length - 1
+        else      
+          @transitions_index[index] - 1          
+        end
+      end            
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Algiers.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Algiers.rb
new file mode 100644
index 00000000..8c5f2557
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Algiers.rb
@@ -0,0 +1,55 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Africa
+      module Algiers
+        include TimezoneDefinition
+        
+        timezone 'Africa/Algiers' do |tz|
+          tz.offset :o0, 732, 0, :LMT
+          tz.offset :o1, 561, 0, :PMT
+          tz.offset :o2, 0, 0, :WET
+          tz.offset :o3, 0, 3600, :WEST
+          tz.offset :o4, 3600, 0, :CET
+          tz.offset :o5, 3600, 3600, :CEST
+          
+          tz.transition 1891, 3, :o1, 2170625843, 900
+          tz.transition 1911, 3, :o2, 69670267013, 28800
+          tz.transition 1916, 6, :o3, 58104707, 24
+          tz.transition 1916, 10, :o2, 58107323, 24
+          tz.transition 1917, 3, :o3, 58111499, 24
+          tz.transition 1917, 10, :o2, 58116227, 24
+          tz.transition 1918, 3, :o3, 58119899, 24
+          tz.transition 1918, 10, :o2, 58124963, 24
+          tz.transition 1919, 3, :o3, 58128467, 24
+          tz.transition 1919, 10, :o2, 58133699, 24
+          tz.transition 1920, 2, :o3, 58136867, 24
+          tz.transition 1920, 10, :o2, 58142915, 24
+          tz.transition 1921, 3, :o3, 58146323, 24
+          tz.transition 1921, 6, :o2, 58148699, 24
+          tz.transition 1939, 9, :o3, 58308443, 24
+          tz.transition 1939, 11, :o2, 4859173, 2
+          tz.transition 1940, 2, :o4, 29156215, 12
+          tz.transition 1944, 4, :o5, 58348405, 24
+          tz.transition 1944, 10, :o4, 4862743, 2
+          tz.transition 1945, 4, :o5, 58357141, 24
+          tz.transition 1945, 9, :o4, 58361147, 24
+          tz.transition 1946, 10, :o2, 58370411, 24
+          tz.transition 1956, 1, :o4, 4871003, 2
+          tz.transition 1963, 4, :o2, 58515203, 24
+          tz.transition 1971, 4, :o3, 41468400
+          tz.transition 1971, 9, :o2, 54774000
+          tz.transition 1977, 5, :o3, 231724800
+          tz.transition 1977, 10, :o4, 246236400
+          tz.transition 1978, 3, :o5, 259545600
+          tz.transition 1978, 9, :o4, 275274000
+          tz.transition 1979, 10, :o2, 309740400
+          tz.transition 1980, 4, :o3, 325468800
+          tz.transition 1980, 10, :o2, 341802000
+          tz.transition 1981, 5, :o4, 357523200
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Cairo.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Cairo.rb
new file mode 100644
index 00000000..6e6daf35
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Cairo.rb
@@ -0,0 +1,219 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Africa
+      module Cairo
+        include TimezoneDefinition
+        
+        timezone 'Africa/Cairo' do |tz|
+          tz.offset :o0, 7500, 0, :LMT
+          tz.offset :o1, 7200, 0, :EET
+          tz.offset :o2, 7200, 3600, :EEST
+          
+          tz.transition 1900, 9, :o1, 695604503, 288
+          tz.transition 1940, 7, :o2, 29157905, 12
+          tz.transition 1940, 9, :o1, 19439227, 8
+          tz.transition 1941, 4, :o2, 29161193, 12
+          tz.transition 1941, 9, :o1, 19442027, 8
+          tz.transition 1942, 3, :o2, 29165405, 12
+          tz.transition 1942, 10, :o1, 19445275, 8
+          tz.transition 1943, 3, :o2, 29169785, 12
+          tz.transition 1943, 10, :o1, 19448235, 8
+          tz.transition 1944, 3, :o2, 29174177, 12
+          tz.transition 1944, 10, :o1, 19451163, 8
+          tz.transition 1945, 4, :o2, 29178737, 12
+          tz.transition 1945, 10, :o1, 19454083, 8
+          tz.transition 1957, 5, :o2, 29231621, 12
+          tz.transition 1957, 9, :o1, 19488899, 8
+          tz.transition 1958, 4, :o2, 29235893, 12
+          tz.transition 1958, 9, :o1, 19491819, 8
+          tz.transition 1959, 4, :o2, 58480547, 24
+          tz.transition 1959, 9, :o1, 4873683, 2
+          tz.transition 1960, 4, :o2, 58489331, 24
+          tz.transition 1960, 9, :o1, 4874415, 2
+          tz.transition 1961, 4, :o2, 58498091, 24
+          tz.transition 1961, 9, :o1, 4875145, 2
+          tz.transition 1962, 4, :o2, 58506851, 24
+          tz.transition 1962, 9, :o1, 4875875, 2
+          tz.transition 1963, 4, :o2, 58515611, 24
+          tz.transition 1963, 9, :o1, 4876605, 2
+          tz.transition 1964, 4, :o2, 58524395, 24
+          tz.transition 1964, 9, :o1, 4877337, 2
+          tz.transition 1965, 4, :o2, 58533155, 24
+          tz.transition 1965, 9, :o1, 4878067, 2
+          tz.transition 1966, 4, :o2, 58541915, 24
+          tz.transition 1966, 10, :o1, 4878799, 2
+          tz.transition 1967, 4, :o2, 58550675, 24
+          tz.transition 1967, 10, :o1, 4879529, 2
+          tz.transition 1968, 4, :o2, 58559459, 24
+          tz.transition 1968, 10, :o1, 4880261, 2
+          tz.transition 1969, 4, :o2, 58568219, 24
+          tz.transition 1969, 10, :o1, 4880991, 2
+          tz.transition 1970, 4, :o2, 10364400
+          tz.transition 1970, 10, :o1, 23587200
+          tz.transition 1971, 4, :o2, 41900400
+          tz.transition 1971, 10, :o1, 55123200
+          tz.transition 1972, 4, :o2, 73522800
+          tz.transition 1972, 10, :o1, 86745600
+          tz.transition 1973, 4, :o2, 105058800
+          tz.transition 1973, 10, :o1, 118281600
+          tz.transition 1974, 4, :o2, 136594800
+          tz.transition 1974, 10, :o1, 149817600
+          tz.transition 1975, 4, :o2, 168130800
+          tz.transition 1975, 10, :o1, 181353600
+          tz.transition 1976, 4, :o2, 199753200
+          tz.transition 1976, 10, :o1, 212976000
+          tz.transition 1977, 4, :o2, 231289200
+          tz.transition 1977, 10, :o1, 244512000
+          tz.transition 1978, 4, :o2, 262825200
+          tz.transition 1978, 10, :o1, 276048000
+          tz.transition 1979, 4, :o2, 294361200
+          tz.transition 1979, 10, :o1, 307584000
+          tz.transition 1980, 4, :o2, 325983600
+          tz.transition 1980, 10, :o1, 339206400
+          tz.transition 1981, 4, :o2, 357519600
+          tz.transition 1981, 10, :o1, 370742400
+          tz.transition 1982, 7, :o2, 396399600
+          tz.transition 1982, 10, :o1, 402278400
+          tz.transition 1983, 7, :o2, 426812400
+          tz.transition 1983, 10, :o1, 433814400
+          tz.transition 1984, 4, :o2, 452214000
+          tz.transition 1984, 10, :o1, 465436800
+          tz.transition 1985, 4, :o2, 483750000
+          tz.transition 1985, 10, :o1, 496972800
+          tz.transition 1986, 4, :o2, 515286000
+          tz.transition 1986, 10, :o1, 528508800
+          tz.transition 1987, 4, :o2, 546822000
+          tz.transition 1987, 10, :o1, 560044800
+          tz.transition 1988, 4, :o2, 578444400
+          tz.transition 1988, 10, :o1, 591667200
+          tz.transition 1989, 5, :o2, 610412400
+          tz.transition 1989, 10, :o1, 623203200
+          tz.transition 1990, 4, :o2, 641516400
+          tz.transition 1990, 10, :o1, 654739200
+          tz.transition 1991, 4, :o2, 673052400
+          tz.transition 1991, 10, :o1, 686275200
+          tz.transition 1992, 4, :o2, 704674800
+          tz.transition 1992, 10, :o1, 717897600
+          tz.transition 1993, 4, :o2, 736210800
+          tz.transition 1993, 10, :o1, 749433600
+          tz.transition 1994, 4, :o2, 767746800
+          tz.transition 1994, 10, :o1, 780969600
+          tz.transition 1995, 4, :o2, 799020000
+          tz.transition 1995, 9, :o1, 812322000
+          tz.transition 1996, 4, :o2, 830469600
+          tz.transition 1996, 9, :o1, 843771600
+          tz.transition 1997, 4, :o2, 861919200
+          tz.transition 1997, 9, :o1, 875221200
+          tz.transition 1998, 4, :o2, 893368800
+          tz.transition 1998, 9, :o1, 906670800
+          tz.transition 1999, 4, :o2, 925423200
+          tz.transition 1999, 9, :o1, 938725200
+          tz.transition 2000, 4, :o2, 956872800
+          tz.transition 2000, 9, :o1, 970174800
+          tz.transition 2001, 4, :o2, 988322400
+          tz.transition 2001, 9, :o1, 1001624400
+          tz.transition 2002, 4, :o2, 1019772000
+          tz.transition 2002, 9, :o1, 1033074000
+          tz.transition 2003, 4, :o2, 1051221600
+          tz.transition 2003, 9, :o1, 1064523600
+          tz.transition 2004, 4, :o2, 1083276000
+          tz.transition 2004, 9, :o1, 1096578000
+          tz.transition 2005, 4, :o2, 1114725600
+          tz.transition 2005, 9, :o1, 1128027600
+          tz.transition 2006, 4, :o2, 1146175200
+          tz.transition 2006, 9, :o1, 1158872400
+          tz.transition 2007, 4, :o2, 1177624800
+          tz.transition 2007, 9, :o1, 1189112400
+          tz.transition 2008, 4, :o2, 1209074400
+          tz.transition 2008, 8, :o1, 1219957200
+          tz.transition 2009, 4, :o2, 1240524000
+          tz.transition 2009, 8, :o1, 1251406800
+          tz.transition 2010, 4, :o2, 1272578400
+          tz.transition 2010, 8, :o1, 1282856400
+          tz.transition 2011, 4, :o2, 1304028000
+          tz.transition 2011, 8, :o1, 1314306000
+          tz.transition 2012, 4, :o2, 1335477600
+          tz.transition 2012, 8, :o1, 1346360400
+          tz.transition 2013, 4, :o2, 1366927200
+          tz.transition 2013, 8, :o1, 1377810000
+          tz.transition 2014, 4, :o2, 1398376800
+          tz.transition 2014, 8, :o1, 1409259600
+          tz.transition 2015, 4, :o2, 1429826400
+          tz.transition 2015, 8, :o1, 1440709200
+          tz.transition 2016, 4, :o2, 1461880800
+          tz.transition 2016, 8, :o1, 1472158800
+          tz.transition 2017, 4, :o2, 1493330400
+          tz.transition 2017, 8, :o1, 1504213200
+          tz.transition 2018, 4, :o2, 1524780000
+          tz.transition 2018, 8, :o1, 1535662800
+          tz.transition 2019, 4, :o2, 1556229600
+          tz.transition 2019, 8, :o1, 1567112400
+          tz.transition 2020, 4, :o2, 1587679200
+          tz.transition 2020, 8, :o1, 1598562000
+          tz.transition 2021, 4, :o2, 1619733600
+          tz.transition 2021, 8, :o1, 1630011600
+          tz.transition 2022, 4, :o2, 1651183200
+          tz.transition 2022, 8, :o1, 1661461200
+          tz.transition 2023, 4, :o2, 1682632800
+          tz.transition 2023, 8, :o1, 1693515600
+          tz.transition 2024, 4, :o2, 1714082400
+          tz.transition 2024, 8, :o1, 1724965200
+          tz.transition 2025, 4, :o2, 1745532000
+          tz.transition 2025, 8, :o1, 1756414800
+          tz.transition 2026, 4, :o2, 1776981600
+          tz.transition 2026, 8, :o1, 1787864400
+          tz.transition 2027, 4, :o2, 1809036000
+          tz.transition 2027, 8, :o1, 1819314000
+          tz.transition 2028, 4, :o2, 1840485600
+          tz.transition 2028, 8, :o1, 1851368400
+          tz.transition 2029, 4, :o2, 1871935200
+          tz.transition 2029, 8, :o1, 1882818000
+          tz.transition 2030, 4, :o2, 1903384800
+          tz.transition 2030, 8, :o1, 1914267600
+          tz.transition 2031, 4, :o2, 1934834400
+          tz.transition 2031, 8, :o1, 1945717200
+          tz.transition 2032, 4, :o2, 1966888800
+          tz.transition 2032, 8, :o1, 1977166800
+          tz.transition 2033, 4, :o2, 1998338400
+          tz.transition 2033, 8, :o1, 2008616400
+          tz.transition 2034, 4, :o2, 2029788000
+          tz.transition 2034, 8, :o1, 2040670800
+          tz.transition 2035, 4, :o2, 2061237600
+          tz.transition 2035, 8, :o1, 2072120400
+          tz.transition 2036, 4, :o2, 2092687200
+          tz.transition 2036, 8, :o1, 2103570000
+          tz.transition 2037, 4, :o2, 2124136800
+          tz.transition 2037, 8, :o1, 2135019600
+          tz.transition 2038, 4, :o2, 29586521, 12
+          tz.transition 2038, 8, :o1, 19725299, 8
+          tz.transition 2039, 4, :o2, 29590889, 12
+          tz.transition 2039, 8, :o1, 19728211, 8
+          tz.transition 2040, 4, :o2, 29595257, 12
+          tz.transition 2040, 8, :o1, 19731179, 8
+          tz.transition 2041, 4, :o2, 29599625, 12
+          tz.transition 2041, 8, :o1, 19734091, 8
+          tz.transition 2042, 4, :o2, 29603993, 12
+          tz.transition 2042, 8, :o1, 19737003, 8
+          tz.transition 2043, 4, :o2, 29608361, 12
+          tz.transition 2043, 8, :o1, 19739915, 8
+          tz.transition 2044, 4, :o2, 29612813, 12
+          tz.transition 2044, 8, :o1, 19742827, 8
+          tz.transition 2045, 4, :o2, 29617181, 12
+          tz.transition 2045, 8, :o1, 19745795, 8
+          tz.transition 2046, 4, :o2, 29621549, 12
+          tz.transition 2046, 8, :o1, 19748707, 8
+          tz.transition 2047, 4, :o2, 29625917, 12
+          tz.transition 2047, 8, :o1, 19751619, 8
+          tz.transition 2048, 4, :o2, 29630285, 12
+          tz.transition 2048, 8, :o1, 19754531, 8
+          tz.transition 2049, 4, :o2, 29634737, 12
+          tz.transition 2049, 8, :o1, 19757443, 8
+          tz.transition 2050, 4, :o2, 29639105, 12
+          tz.transition 2050, 8, :o1, 19760355, 8
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Casablanca.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Casablanca.rb
new file mode 100644
index 00000000..dddf533f
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Casablanca.rb
@@ -0,0 +1,40 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Africa
+      module Casablanca
+        include TimezoneDefinition
+        
+        timezone 'Africa/Casablanca' do |tz|
+          tz.offset :o0, -1820, 0, :LMT
+          tz.offset :o1, 0, 0, :WET
+          tz.offset :o2, 0, 3600, :WEST
+          tz.offset :o3, 3600, 0, :CET
+          
+          tz.transition 1913, 10, :o1, 10454687371, 4320
+          tz.transition 1939, 9, :o2, 4859037, 2
+          tz.transition 1939, 11, :o1, 58310075, 24
+          tz.transition 1940, 2, :o2, 4859369, 2
+          tz.transition 1945, 11, :o1, 58362659, 24
+          tz.transition 1950, 6, :o2, 4866887, 2
+          tz.transition 1950, 10, :o1, 58406003, 24
+          tz.transition 1967, 6, :o2, 2439645, 1
+          tz.transition 1967, 9, :o1, 58554347, 24
+          tz.transition 1974, 6, :o2, 141264000
+          tz.transition 1974, 8, :o1, 147222000
+          tz.transition 1976, 5, :o2, 199756800
+          tz.transition 1976, 7, :o1, 207702000
+          tz.transition 1977, 5, :o2, 231292800
+          tz.transition 1977, 9, :o1, 244249200
+          tz.transition 1978, 6, :o2, 265507200
+          tz.transition 1978, 8, :o1, 271033200
+          tz.transition 1984, 3, :o3, 448243200
+          tz.transition 1985, 12, :o1, 504918000
+          tz.transition 2008, 6, :o2, 1212278400
+          tz.transition 2008, 9, :o1, 1222556400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Harare.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Harare.rb
new file mode 100644
index 00000000..070c95ae
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Harare.rb
@@ -0,0 +1,18 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Africa
+      module Harare
+        include TimezoneDefinition
+        
+        timezone 'Africa/Harare' do |tz|
+          tz.offset :o0, 7452, 0, :LMT
+          tz.offset :o1, 7200, 0, :CAT
+          
+          tz.transition 1903, 2, :o1, 1932939531, 800
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Johannesburg.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Johannesburg.rb
new file mode 100644
index 00000000..f0af0d8e
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Johannesburg.rb
@@ -0,0 +1,25 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Africa
+      module Johannesburg
+        include TimezoneDefinition
+        
+        timezone 'Africa/Johannesburg' do |tz|
+          tz.offset :o0, 6720, 0, :LMT
+          tz.offset :o1, 5400, 0, :SAST
+          tz.offset :o2, 7200, 0, :SAST
+          tz.offset :o3, 7200, 3600, :SAST
+          
+          tz.transition 1892, 2, :o1, 108546139, 45
+          tz.transition 1903, 2, :o2, 38658791, 16
+          tz.transition 1942, 9, :o3, 4861245, 2
+          tz.transition 1943, 3, :o2, 58339307, 24
+          tz.transition 1943, 9, :o3, 4861973, 2
+          tz.transition 1944, 3, :o2, 58348043, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Monrovia.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Monrovia.rb
new file mode 100644
index 00000000..40e711fa
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Monrovia.rb
@@ -0,0 +1,22 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Africa
+      module Monrovia
+        include TimezoneDefinition
+        
+        timezone 'Africa/Monrovia' do |tz|
+          tz.offset :o0, -2588, 0, :LMT
+          tz.offset :o1, -2588, 0, :MMT
+          tz.offset :o2, -2670, 0, :LRT
+          tz.offset :o3, 0, 0, :GMT
+          
+          tz.transition 1882, 1, :o1, 52022445047, 21600
+          tz.transition 1919, 3, :o2, 52315600247, 21600
+          tz.transition 1972, 5, :o3, 73529070
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Nairobi.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Nairobi.rb
new file mode 100644
index 00000000..7b0a2f43
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Nairobi.rb
@@ -0,0 +1,23 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Africa
+      module Nairobi
+        include TimezoneDefinition
+        
+        timezone 'Africa/Nairobi' do |tz|
+          tz.offset :o0, 8836, 0, :LMT
+          tz.offset :o1, 10800, 0, :EAT
+          tz.offset :o2, 9000, 0, :BEAT
+          tz.offset :o3, 9885, 0, :BEAUT
+          
+          tz.transition 1928, 6, :o1, 52389253391, 21600
+          tz.transition 1929, 12, :o2, 19407819, 8
+          tz.transition 1939, 12, :o3, 116622211, 48
+          tz.transition 1959, 12, :o1, 14036742061, 5760
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/Buenos_Aires.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
new file mode 100644
index 00000000..7536f755
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
@@ -0,0 +1,166 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Argentina
+        module Buenos_Aires
+          include TimezoneDefinition
+          
+          timezone 'America/Argentina/Buenos_Aires' do |tz|
+            tz.offset :o0, -14028, 0, :LMT
+            tz.offset :o1, -15408, 0, :CMT
+            tz.offset :o2, -14400, 0, :ART
+            tz.offset :o3, -14400, 3600, :ARST
+            tz.offset :o4, -10800, 0, :ART
+            tz.offset :o5, -10800, 3600, :ARST
+            
+            tz.transition 1894, 10, :o1, 17374555169, 7200
+            tz.transition 1920, 5, :o2, 1453467407, 600
+            tz.transition 1930, 12, :o3, 7278935, 3
+            tz.transition 1931, 4, :o2, 19411461, 8
+            tz.transition 1931, 10, :o3, 7279889, 3
+            tz.transition 1932, 3, :o2, 19414141, 8
+            tz.transition 1932, 11, :o3, 7281038, 3
+            tz.transition 1933, 3, :o2, 19417061, 8
+            tz.transition 1933, 11, :o3, 7282133, 3
+            tz.transition 1934, 3, :o2, 19419981, 8
+            tz.transition 1934, 11, :o3, 7283228, 3
+            tz.transition 1935, 3, :o2, 19422901, 8
+            tz.transition 1935, 11, :o3, 7284323, 3
+            tz.transition 1936, 3, :o2, 19425829, 8
+            tz.transition 1936, 11, :o3, 7285421, 3
+            tz.transition 1937, 3, :o2, 19428749, 8
+            tz.transition 1937, 11, :o3, 7286516, 3
+            tz.transition 1938, 3, :o2, 19431669, 8
+            tz.transition 1938, 11, :o3, 7287611, 3
+            tz.transition 1939, 3, :o2, 19434589, 8
+            tz.transition 1939, 11, :o3, 7288706, 3
+            tz.transition 1940, 3, :o2, 19437517, 8
+            tz.transition 1940, 7, :o3, 7289435, 3
+            tz.transition 1941, 6, :o2, 19441285, 8
+            tz.transition 1941, 10, :o3, 7290848, 3
+            tz.transition 1943, 8, :o2, 19447501, 8
+            tz.transition 1943, 10, :o3, 7293038, 3
+            tz.transition 1946, 3, :o2, 19455045, 8
+            tz.transition 1946, 10, :o3, 7296284, 3
+            tz.transition 1963, 10, :o2, 19506429, 8
+            tz.transition 1963, 12, :o3, 7315136, 3
+            tz.transition 1964, 3, :o2, 19507645, 8
+            tz.transition 1964, 10, :o3, 7316051, 3
+            tz.transition 1965, 3, :o2, 19510565, 8
+            tz.transition 1965, 10, :o3, 7317146, 3
+            tz.transition 1966, 3, :o2, 19513485, 8
+            tz.transition 1966, 10, :o3, 7318241, 3
+            tz.transition 1967, 4, :o2, 19516661, 8
+            tz.transition 1967, 10, :o3, 7319294, 3
+            tz.transition 1968, 4, :o2, 19519629, 8
+            tz.transition 1968, 10, :o3, 7320407, 3
+            tz.transition 1969, 4, :o2, 19522541, 8
+            tz.transition 1969, 10, :o4, 7321499, 3
+            tz.transition 1974, 1, :o5, 128142000
+            tz.transition 1974, 5, :o4, 136605600
+            tz.transition 1988, 12, :o5, 596948400
+            tz.transition 1989, 3, :o4, 605066400
+            tz.transition 1989, 10, :o5, 624423600
+            tz.transition 1990, 3, :o4, 636516000
+            tz.transition 1990, 10, :o5, 656478000
+            tz.transition 1991, 3, :o4, 667965600
+            tz.transition 1991, 10, :o5, 687927600
+            tz.transition 1992, 3, :o4, 699415200
+            tz.transition 1992, 10, :o5, 719377200
+            tz.transition 1993, 3, :o4, 731469600
+            tz.transition 1999, 10, :o3, 938919600
+            tz.transition 2000, 3, :o4, 952052400
+            tz.transition 2007, 12, :o5, 1198983600
+            tz.transition 2008, 3, :o4, 1205632800
+            tz.transition 2008, 10, :o5, 1223175600
+            tz.transition 2009, 3, :o4, 1237082400
+            tz.transition 2009, 10, :o5, 1254625200
+            tz.transition 2010, 3, :o4, 1269136800
+            tz.transition 2010, 10, :o5, 1286074800
+            tz.transition 2011, 3, :o4, 1300586400
+            tz.transition 2011, 10, :o5, 1317524400
+            tz.transition 2012, 3, :o4, 1332036000
+            tz.transition 2012, 10, :o5, 1349578800
+            tz.transition 2013, 3, :o4, 1363485600
+            tz.transition 2013, 10, :o5, 1381028400
+            tz.transition 2014, 3, :o4, 1394935200
+            tz.transition 2014, 10, :o5, 1412478000
+            tz.transition 2015, 3, :o4, 1426384800
+            tz.transition 2015, 10, :o5, 1443927600
+            tz.transition 2016, 3, :o4, 1458439200
+            tz.transition 2016, 10, :o5, 1475377200
+            tz.transition 2017, 3, :o4, 1489888800
+            tz.transition 2017, 10, :o5, 1506826800
+            tz.transition 2018, 3, :o4, 1521338400
+            tz.transition 2018, 10, :o5, 1538881200
+            tz.transition 2019, 3, :o4, 1552788000
+            tz.transition 2019, 10, :o5, 1570330800
+            tz.transition 2020, 3, :o4, 1584237600
+            tz.transition 2020, 10, :o5, 1601780400
+            tz.transition 2021, 3, :o4, 1616292000
+            tz.transition 2021, 10, :o5, 1633230000
+            tz.transition 2022, 3, :o4, 1647741600
+            tz.transition 2022, 10, :o5, 1664679600
+            tz.transition 2023, 3, :o4, 1679191200
+            tz.transition 2023, 10, :o5, 1696129200
+            tz.transition 2024, 3, :o4, 1710640800
+            tz.transition 2024, 10, :o5, 1728183600
+            tz.transition 2025, 3, :o4, 1742090400
+            tz.transition 2025, 10, :o5, 1759633200
+            tz.transition 2026, 3, :o4, 1773540000
+            tz.transition 2026, 10, :o5, 1791082800
+            tz.transition 2027, 3, :o4, 1805594400
+            tz.transition 2027, 10, :o5, 1822532400
+            tz.transition 2028, 3, :o4, 1837044000
+            tz.transition 2028, 10, :o5, 1853982000
+            tz.transition 2029, 3, :o4, 1868493600
+            tz.transition 2029, 10, :o5, 1886036400
+            tz.transition 2030, 3, :o4, 1899943200
+            tz.transition 2030, 10, :o5, 1917486000
+            tz.transition 2031, 3, :o4, 1931392800
+            tz.transition 2031, 10, :o5, 1948935600
+            tz.transition 2032, 3, :o4, 1963447200
+            tz.transition 2032, 10, :o5, 1980385200
+            tz.transition 2033, 3, :o4, 1994896800
+            tz.transition 2033, 10, :o5, 2011834800
+            tz.transition 2034, 3, :o4, 2026346400
+            tz.transition 2034, 10, :o5, 2043284400
+            tz.transition 2035, 3, :o4, 2057796000
+            tz.transition 2035, 10, :o5, 2075338800
+            tz.transition 2036, 3, :o4, 2089245600
+            tz.transition 2036, 10, :o5, 2106788400
+            tz.transition 2037, 3, :o4, 2120695200
+            tz.transition 2037, 10, :o5, 2138238000
+            tz.transition 2038, 3, :o4, 29586043, 12
+            tz.transition 2038, 10, :o5, 19725597, 8
+            tz.transition 2039, 3, :o4, 29590411, 12
+            tz.transition 2039, 10, :o5, 19728509, 8
+            tz.transition 2040, 3, :o4, 29594779, 12
+            tz.transition 2040, 10, :o5, 19731477, 8
+            tz.transition 2041, 3, :o4, 29599147, 12
+            tz.transition 2041, 10, :o5, 19734389, 8
+            tz.transition 2042, 3, :o4, 29603515, 12
+            tz.transition 2042, 10, :o5, 19737301, 8
+            tz.transition 2043, 3, :o4, 29607883, 12
+            tz.transition 2043, 10, :o5, 19740213, 8
+            tz.transition 2044, 3, :o4, 29612335, 12
+            tz.transition 2044, 10, :o5, 19743125, 8
+            tz.transition 2045, 3, :o4, 29616703, 12
+            tz.transition 2045, 10, :o5, 19746037, 8
+            tz.transition 2046, 3, :o4, 29621071, 12
+            tz.transition 2046, 10, :o5, 19749005, 8
+            tz.transition 2047, 3, :o4, 29625439, 12
+            tz.transition 2047, 10, :o5, 19751917, 8
+            tz.transition 2048, 3, :o4, 29629807, 12
+            tz.transition 2048, 10, :o5, 19754829, 8
+            tz.transition 2049, 3, :o4, 29634259, 12
+            tz.transition 2049, 10, :o5, 19757741, 8
+            tz.transition 2050, 3, :o4, 29638627, 12
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/San_Juan.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/San_Juan.rb
new file mode 100644
index 00000000..a5413612
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/San_Juan.rb
@@ -0,0 +1,170 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Argentina
+        module San_Juan
+          include TimezoneDefinition
+          
+          timezone 'America/Argentina/San_Juan' do |tz|
+            tz.offset :o0, -16444, 0, :LMT
+            tz.offset :o1, -15408, 0, :CMT
+            tz.offset :o2, -14400, 0, :ART
+            tz.offset :o3, -14400, 3600, :ARST
+            tz.offset :o4, -10800, 0, :ART
+            tz.offset :o5, -10800, 3600, :ARST
+            tz.offset :o6, -14400, 0, :WART
+            
+            tz.transition 1894, 10, :o1, 52123666111, 21600
+            tz.transition 1920, 5, :o2, 1453467407, 600
+            tz.transition 1930, 12, :o3, 7278935, 3
+            tz.transition 1931, 4, :o2, 19411461, 8
+            tz.transition 1931, 10, :o3, 7279889, 3
+            tz.transition 1932, 3, :o2, 19414141, 8
+            tz.transition 1932, 11, :o3, 7281038, 3
+            tz.transition 1933, 3, :o2, 19417061, 8
+            tz.transition 1933, 11, :o3, 7282133, 3
+            tz.transition 1934, 3, :o2, 19419981, 8
+            tz.transition 1934, 11, :o3, 7283228, 3
+            tz.transition 1935, 3, :o2, 19422901, 8
+            tz.transition 1935, 11, :o3, 7284323, 3
+            tz.transition 1936, 3, :o2, 19425829, 8
+            tz.transition 1936, 11, :o3, 7285421, 3
+            tz.transition 1937, 3, :o2, 19428749, 8
+            tz.transition 1937, 11, :o3, 7286516, 3
+            tz.transition 1938, 3, :o2, 19431669, 8
+            tz.transition 1938, 11, :o3, 7287611, 3
+            tz.transition 1939, 3, :o2, 19434589, 8
+            tz.transition 1939, 11, :o3, 7288706, 3
+            tz.transition 1940, 3, :o2, 19437517, 8
+            tz.transition 1940, 7, :o3, 7289435, 3
+            tz.transition 1941, 6, :o2, 19441285, 8
+            tz.transition 1941, 10, :o3, 7290848, 3
+            tz.transition 1943, 8, :o2, 19447501, 8
+            tz.transition 1943, 10, :o3, 7293038, 3
+            tz.transition 1946, 3, :o2, 19455045, 8
+            tz.transition 1946, 10, :o3, 7296284, 3
+            tz.transition 1963, 10, :o2, 19506429, 8
+            tz.transition 1963, 12, :o3, 7315136, 3
+            tz.transition 1964, 3, :o2, 19507645, 8
+            tz.transition 1964, 10, :o3, 7316051, 3
+            tz.transition 1965, 3, :o2, 19510565, 8
+            tz.transition 1965, 10, :o3, 7317146, 3
+            tz.transition 1966, 3, :o2, 19513485, 8
+            tz.transition 1966, 10, :o3, 7318241, 3
+            tz.transition 1967, 4, :o2, 19516661, 8
+            tz.transition 1967, 10, :o3, 7319294, 3
+            tz.transition 1968, 4, :o2, 19519629, 8
+            tz.transition 1968, 10, :o3, 7320407, 3
+            tz.transition 1969, 4, :o2, 19522541, 8
+            tz.transition 1969, 10, :o4, 7321499, 3
+            tz.transition 1974, 1, :o5, 128142000
+            tz.transition 1974, 5, :o4, 136605600
+            tz.transition 1988, 12, :o5, 596948400
+            tz.transition 1989, 3, :o4, 605066400
+            tz.transition 1989, 10, :o5, 624423600
+            tz.transition 1990, 3, :o4, 636516000
+            tz.transition 1990, 10, :o5, 656478000
+            tz.transition 1991, 3, :o6, 667792800
+            tz.transition 1991, 5, :o4, 673588800
+            tz.transition 1991, 10, :o5, 687927600
+            tz.transition 1992, 3, :o4, 699415200
+            tz.transition 1992, 10, :o5, 719377200
+            tz.transition 1993, 3, :o4, 731469600
+            tz.transition 1999, 10, :o3, 938919600
+            tz.transition 2000, 3, :o4, 952052400
+            tz.transition 2004, 5, :o6, 1085972400
+            tz.transition 2004, 7, :o4, 1090728000
+            tz.transition 2007, 12, :o5, 1198983600
+            tz.transition 2008, 3, :o4, 1205632800
+            tz.transition 2008, 10, :o5, 1223175600
+            tz.transition 2009, 3, :o4, 1237082400
+            tz.transition 2009, 10, :o5, 1254625200
+            tz.transition 2010, 3, :o4, 1269136800
+            tz.transition 2010, 10, :o5, 1286074800
+            tz.transition 2011, 3, :o4, 1300586400
+            tz.transition 2011, 10, :o5, 1317524400
+            tz.transition 2012, 3, :o4, 1332036000
+            tz.transition 2012, 10, :o5, 1349578800
+            tz.transition 2013, 3, :o4, 1363485600
+            tz.transition 2013, 10, :o5, 1381028400
+            tz.transition 2014, 3, :o4, 1394935200
+            tz.transition 2014, 10, :o5, 1412478000
+            tz.transition 2015, 3, :o4, 1426384800
+            tz.transition 2015, 10, :o5, 1443927600
+            tz.transition 2016, 3, :o4, 1458439200
+            tz.transition 2016, 10, :o5, 1475377200
+            tz.transition 2017, 3, :o4, 1489888800
+            tz.transition 2017, 10, :o5, 1506826800
+            tz.transition 2018, 3, :o4, 1521338400
+            tz.transition 2018, 10, :o5, 1538881200
+            tz.transition 2019, 3, :o4, 1552788000
+            tz.transition 2019, 10, :o5, 1570330800
+            tz.transition 2020, 3, :o4, 1584237600
+            tz.transition 2020, 10, :o5, 1601780400
+            tz.transition 2021, 3, :o4, 1616292000
+            tz.transition 2021, 10, :o5, 1633230000
+            tz.transition 2022, 3, :o4, 1647741600
+            tz.transition 2022, 10, :o5, 1664679600
+            tz.transition 2023, 3, :o4, 1679191200
+            tz.transition 2023, 10, :o5, 1696129200
+            tz.transition 2024, 3, :o4, 1710640800
+            tz.transition 2024, 10, :o5, 1728183600
+            tz.transition 2025, 3, :o4, 1742090400
+            tz.transition 2025, 10, :o5, 1759633200
+            tz.transition 2026, 3, :o4, 1773540000
+            tz.transition 2026, 10, :o5, 1791082800
+            tz.transition 2027, 3, :o4, 1805594400
+            tz.transition 2027, 10, :o5, 1822532400
+            tz.transition 2028, 3, :o4, 1837044000
+            tz.transition 2028, 10, :o5, 1853982000
+            tz.transition 2029, 3, :o4, 1868493600
+            tz.transition 2029, 10, :o5, 1886036400
+            tz.transition 2030, 3, :o4, 1899943200
+            tz.transition 2030, 10, :o5, 1917486000
+            tz.transition 2031, 3, :o4, 1931392800
+            tz.transition 2031, 10, :o5, 1948935600
+            tz.transition 2032, 3, :o4, 1963447200
+            tz.transition 2032, 10, :o5, 1980385200
+            tz.transition 2033, 3, :o4, 1994896800
+            tz.transition 2033, 10, :o5, 2011834800
+            tz.transition 2034, 3, :o4, 2026346400
+            tz.transition 2034, 10, :o5, 2043284400
+            tz.transition 2035, 3, :o4, 2057796000
+            tz.transition 2035, 10, :o5, 2075338800
+            tz.transition 2036, 3, :o4, 2089245600
+            tz.transition 2036, 10, :o5, 2106788400
+            tz.transition 2037, 3, :o4, 2120695200
+            tz.transition 2037, 10, :o5, 2138238000
+            tz.transition 2038, 3, :o4, 29586043, 12
+            tz.transition 2038, 10, :o5, 19725597, 8
+            tz.transition 2039, 3, :o4, 29590411, 12
+            tz.transition 2039, 10, :o5, 19728509, 8
+            tz.transition 2040, 3, :o4, 29594779, 12
+            tz.transition 2040, 10, :o5, 19731477, 8
+            tz.transition 2041, 3, :o4, 29599147, 12
+            tz.transition 2041, 10, :o5, 19734389, 8
+            tz.transition 2042, 3, :o4, 29603515, 12
+            tz.transition 2042, 10, :o5, 19737301, 8
+            tz.transition 2043, 3, :o4, 29607883, 12
+            tz.transition 2043, 10, :o5, 19740213, 8
+            tz.transition 2044, 3, :o4, 29612335, 12
+            tz.transition 2044, 10, :o5, 19743125, 8
+            tz.transition 2045, 3, :o4, 29616703, 12
+            tz.transition 2045, 10, :o5, 19746037, 8
+            tz.transition 2046, 3, :o4, 29621071, 12
+            tz.transition 2046, 10, :o5, 19749005, 8
+            tz.transition 2047, 3, :o4, 29625439, 12
+            tz.transition 2047, 10, :o5, 19751917, 8
+            tz.transition 2048, 3, :o4, 29629807, 12
+            tz.transition 2048, 10, :o5, 19754829, 8
+            tz.transition 2049, 3, :o4, 29634259, 12
+            tz.transition 2049, 10, :o5, 19757741, 8
+            tz.transition 2050, 3, :o4, 29638627, 12
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Bogota.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Bogota.rb
new file mode 100644
index 00000000..ef96435c
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Bogota.rb
@@ -0,0 +1,23 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Bogota
+        include TimezoneDefinition
+        
+        timezone 'America/Bogota' do |tz|
+          tz.offset :o0, -17780, 0, :LMT
+          tz.offset :o1, -17780, 0, :BMT
+          tz.offset :o2, -18000, 0, :COT
+          tz.offset :o3, -18000, 3600, :COST
+          
+          tz.transition 1884, 3, :o1, 10407954409, 4320
+          tz.transition 1914, 11, :o2, 10456385929, 4320
+          tz.transition 1992, 5, :o3, 704869200
+          tz.transition 1993, 4, :o2, 733896000
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Caracas.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Caracas.rb
new file mode 100644
index 00000000..27392a54
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Caracas.rb
@@ -0,0 +1,23 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Caracas
+        include TimezoneDefinition
+        
+        timezone 'America/Caracas' do |tz|
+          tz.offset :o0, -16064, 0, :LMT
+          tz.offset :o1, -16060, 0, :CMT
+          tz.offset :o2, -16200, 0, :VET
+          tz.offset :o3, -14400, 0, :VET
+          
+          tz.transition 1890, 1, :o1, 1627673863, 675
+          tz.transition 1912, 2, :o2, 10452001043, 4320
+          tz.transition 1965, 1, :o3, 39020187, 16
+          tz.transition 2007, 12, :o2, 1197183600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chicago.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chicago.rb
new file mode 100644
index 00000000..0996857c
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chicago.rb
@@ -0,0 +1,283 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Chicago
+        include TimezoneDefinition
+        
+        timezone 'America/Chicago' do |tz|
+          tz.offset :o0, -21036, 0, :LMT
+          tz.offset :o1, -21600, 0, :CST
+          tz.offset :o2, -21600, 3600, :CDT
+          tz.offset :o3, -18000, 0, :EST
+          tz.offset :o4, -21600, 3600, :CWT
+          tz.offset :o5, -21600, 3600, :CPT
+          
+          tz.transition 1883, 11, :o1, 9636533, 4
+          tz.transition 1918, 3, :o2, 14530103, 6
+          tz.transition 1918, 10, :o1, 58125451, 24
+          tz.transition 1919, 3, :o2, 14532287, 6
+          tz.transition 1919, 10, :o1, 58134187, 24
+          tz.transition 1920, 6, :o2, 14534933, 6
+          tz.transition 1920, 10, :o1, 58143091, 24
+          tz.transition 1921, 3, :o2, 14536655, 6
+          tz.transition 1921, 10, :o1, 58151827, 24
+          tz.transition 1922, 4, :o2, 14539049, 6
+          tz.transition 1922, 9, :o1, 58159723, 24
+          tz.transition 1923, 4, :o2, 14541233, 6
+          tz.transition 1923, 9, :o1, 58168627, 24
+          tz.transition 1924, 4, :o2, 14543417, 6
+          tz.transition 1924, 9, :o1, 58177363, 24
+          tz.transition 1925, 4, :o2, 14545601, 6
+          tz.transition 1925, 9, :o1, 58186099, 24
+          tz.transition 1926, 4, :o2, 14547785, 6
+          tz.transition 1926, 9, :o1, 58194835, 24
+          tz.transition 1927, 4, :o2, 14549969, 6
+          tz.transition 1927, 9, :o1, 58203571, 24
+          tz.transition 1928, 4, :o2, 14552195, 6
+          tz.transition 1928, 9, :o1, 58212475, 24
+          tz.transition 1929, 4, :o2, 14554379, 6
+          tz.transition 1929, 9, :o1, 58221211, 24
+          tz.transition 1930, 4, :o2, 14556563, 6
+          tz.transition 1930, 9, :o1, 58229947, 24
+          tz.transition 1931, 4, :o2, 14558747, 6
+          tz.transition 1931, 9, :o1, 58238683, 24
+          tz.transition 1932, 4, :o2, 14560931, 6
+          tz.transition 1932, 9, :o1, 58247419, 24
+          tz.transition 1933, 4, :o2, 14563157, 6
+          tz.transition 1933, 9, :o1, 58256155, 24
+          tz.transition 1934, 4, :o2, 14565341, 6
+          tz.transition 1934, 9, :o1, 58265059, 24
+          tz.transition 1935, 4, :o2, 14567525, 6
+          tz.transition 1935, 9, :o1, 58273795, 24
+          tz.transition 1936, 3, :o3, 14569373, 6
+          tz.transition 1936, 11, :o1, 58283707, 24
+          tz.transition 1937, 4, :o2, 14571893, 6
+          tz.transition 1937, 9, :o1, 58291267, 24
+          tz.transition 1938, 4, :o2, 14574077, 6
+          tz.transition 1938, 9, :o1, 58300003, 24
+          tz.transition 1939, 4, :o2, 14576303, 6
+          tz.transition 1939, 9, :o1, 58308739, 24
+          tz.transition 1940, 4, :o2, 14578487, 6
+          tz.transition 1940, 9, :o1, 58317643, 24
+          tz.transition 1941, 4, :o2, 14580671, 6
+          tz.transition 1941, 9, :o1, 58326379, 24
+          tz.transition 1942, 2, :o4, 14582399, 6
+          tz.transition 1945, 8, :o5, 58360379, 24
+          tz.transition 1945, 9, :o1, 58361491, 24
+          tz.transition 1946, 4, :o2, 14591633, 6
+          tz.transition 1946, 9, :o1, 58370227, 24
+          tz.transition 1947, 4, :o2, 14593817, 6
+          tz.transition 1947, 9, :o1, 58378963, 24
+          tz.transition 1948, 4, :o2, 14596001, 6
+          tz.transition 1948, 9, :o1, 58387699, 24
+          tz.transition 1949, 4, :o2, 14598185, 6
+          tz.transition 1949, 9, :o1, 58396435, 24
+          tz.transition 1950, 4, :o2, 14600411, 6
+          tz.transition 1950, 9, :o1, 58405171, 24
+          tz.transition 1951, 4, :o2, 14602595, 6
+          tz.transition 1951, 9, :o1, 58414075, 24
+          tz.transition 1952, 4, :o2, 14604779, 6
+          tz.transition 1952, 9, :o1, 58422811, 24
+          tz.transition 1953, 4, :o2, 14606963, 6
+          tz.transition 1953, 9, :o1, 58431547, 24
+          tz.transition 1954, 4, :o2, 14609147, 6
+          tz.transition 1954, 9, :o1, 58440283, 24
+          tz.transition 1955, 4, :o2, 14611331, 6
+          tz.transition 1955, 10, :o1, 58449859, 24
+          tz.transition 1956, 4, :o2, 14613557, 6
+          tz.transition 1956, 10, :o1, 58458595, 24
+          tz.transition 1957, 4, :o2, 14615741, 6
+          tz.transition 1957, 10, :o1, 58467331, 24
+          tz.transition 1958, 4, :o2, 14617925, 6
+          tz.transition 1958, 10, :o1, 58476067, 24
+          tz.transition 1959, 4, :o2, 14620109, 6
+          tz.transition 1959, 10, :o1, 58484803, 24
+          tz.transition 1960, 4, :o2, 14622293, 6
+          tz.transition 1960, 10, :o1, 58493707, 24
+          tz.transition 1961, 4, :o2, 14624519, 6
+          tz.transition 1961, 10, :o1, 58502443, 24
+          tz.transition 1962, 4, :o2, 14626703, 6
+          tz.transition 1962, 10, :o1, 58511179, 24
+          tz.transition 1963, 4, :o2, 14628887, 6
+          tz.transition 1963, 10, :o1, 58519915, 24
+          tz.transition 1964, 4, :o2, 14631071, 6
+          tz.transition 1964, 10, :o1, 58528651, 24
+          tz.transition 1965, 4, :o2, 14633255, 6
+          tz.transition 1965, 10, :o1, 58537555, 24
+          tz.transition 1966, 4, :o2, 14635439, 6
+          tz.transition 1966, 10, :o1, 58546291, 24
+          tz.transition 1967, 4, :o2, 14637665, 6
+          tz.transition 1967, 10, :o1, 58555027, 24
+          tz.transition 1968, 4, :o2, 14639849, 6
+          tz.transition 1968, 10, :o1, 58563763, 24
+          tz.transition 1969, 4, :o2, 14642033, 6
+          tz.transition 1969, 10, :o1, 58572499, 24
+          tz.transition 1970, 4, :o2, 9964800
+          tz.transition 1970, 10, :o1, 25686000
+          tz.transition 1971, 4, :o2, 41414400
+          tz.transition 1971, 10, :o1, 57740400
+          tz.transition 1972, 4, :o2, 73468800
+          tz.transition 1972, 10, :o1, 89190000
+          tz.transition 1973, 4, :o2, 104918400
+          tz.transition 1973, 10, :o1, 120639600
+          tz.transition 1974, 1, :o2, 126691200
+          tz.transition 1974, 10, :o1, 152089200
+          tz.transition 1975, 2, :o2, 162374400
+          tz.transition 1975, 10, :o1, 183538800
+          tz.transition 1976, 4, :o2, 199267200
+          tz.transition 1976, 10, :o1, 215593200
+          tz.transition 1977, 4, :o2, 230716800
+          tz.transition 1977, 10, :o1, 247042800
+          tz.transition 1978, 4, :o2, 262771200
+          tz.transition 1978, 10, :o1, 278492400
+          tz.transition 1979, 4, :o2, 294220800
+          tz.transition 1979, 10, :o1, 309942000
+          tz.transition 1980, 4, :o2, 325670400
+          tz.transition 1980, 10, :o1, 341391600
+          tz.transition 1981, 4, :o2, 357120000
+          tz.transition 1981, 10, :o1, 372841200
+          tz.transition 1982, 4, :o2, 388569600
+          tz.transition 1982, 10, :o1, 404895600
+          tz.transition 1983, 4, :o2, 420019200
+          tz.transition 1983, 10, :o1, 436345200
+          tz.transition 1984, 4, :o2, 452073600
+          tz.transition 1984, 10, :o1, 467794800
+          tz.transition 1985, 4, :o2, 483523200
+          tz.transition 1985, 10, :o1, 499244400
+          tz.transition 1986, 4, :o2, 514972800
+          tz.transition 1986, 10, :o1, 530694000
+          tz.transition 1987, 4, :o2, 544608000
+          tz.transition 1987, 10, :o1, 562143600
+          tz.transition 1988, 4, :o2, 576057600
+          tz.transition 1988, 10, :o1, 594198000
+          tz.transition 1989, 4, :o2, 607507200
+          tz.transition 1989, 10, :o1, 625647600
+          tz.transition 1990, 4, :o2, 638956800
+          tz.transition 1990, 10, :o1, 657097200
+          tz.transition 1991, 4, :o2, 671011200
+          tz.transition 1991, 10, :o1, 688546800
+          tz.transition 1992, 4, :o2, 702460800
+          tz.transition 1992, 10, :o1, 719996400
+          tz.transition 1993, 4, :o2, 733910400
+          tz.transition 1993, 10, :o1, 752050800
+          tz.transition 1994, 4, :o2, 765360000
+          tz.transition 1994, 10, :o1, 783500400
+          tz.transition 1995, 4, :o2, 796809600
+          tz.transition 1995, 10, :o1, 814950000
+          tz.transition 1996, 4, :o2, 828864000
+          tz.transition 1996, 10, :o1, 846399600
+          tz.transition 1997, 4, :o2, 860313600
+          tz.transition 1997, 10, :o1, 877849200
+          tz.transition 1998, 4, :o2, 891763200
+          tz.transition 1998, 10, :o1, 909298800
+          tz.transition 1999, 4, :o2, 923212800
+          tz.transition 1999, 10, :o1, 941353200
+          tz.transition 2000, 4, :o2, 954662400
+          tz.transition 2000, 10, :o1, 972802800
+          tz.transition 2001, 4, :o2, 986112000
+          tz.transition 2001, 10, :o1, 1004252400
+          tz.transition 2002, 4, :o2, 1018166400
+          tz.transition 2002, 10, :o1, 1035702000
+          tz.transition 2003, 4, :o2, 1049616000
+          tz.transition 2003, 10, :o1, 1067151600
+          tz.transition 2004, 4, :o2, 1081065600
+          tz.transition 2004, 10, :o1, 1099206000
+          tz.transition 2005, 4, :o2, 1112515200
+          tz.transition 2005, 10, :o1, 1130655600
+          tz.transition 2006, 4, :o2, 1143964800
+          tz.transition 2006, 10, :o1, 1162105200
+          tz.transition 2007, 3, :o2, 1173600000
+          tz.transition 2007, 11, :o1, 1194159600
+          tz.transition 2008, 3, :o2, 1205049600
+          tz.transition 2008, 11, :o1, 1225609200
+          tz.transition 2009, 3, :o2, 1236499200
+          tz.transition 2009, 11, :o1, 1257058800
+          tz.transition 2010, 3, :o2, 1268553600
+          tz.transition 2010, 11, :o1, 1289113200
+          tz.transition 2011, 3, :o2, 1300003200
+          tz.transition 2011, 11, :o1, 1320562800
+          tz.transition 2012, 3, :o2, 1331452800
+          tz.transition 2012, 11, :o1, 1352012400
+          tz.transition 2013, 3, :o2, 1362902400
+          tz.transition 2013, 11, :o1, 1383462000
+          tz.transition 2014, 3, :o2, 1394352000
+          tz.transition 2014, 11, :o1, 1414911600
+          tz.transition 2015, 3, :o2, 1425801600
+          tz.transition 2015, 11, :o1, 1446361200
+          tz.transition 2016, 3, :o2, 1457856000
+          tz.transition 2016, 11, :o1, 1478415600
+          tz.transition 2017, 3, :o2, 1489305600
+          tz.transition 2017, 11, :o1, 1509865200
+          tz.transition 2018, 3, :o2, 1520755200
+          tz.transition 2018, 11, :o1, 1541314800
+          tz.transition 2019, 3, :o2, 1552204800
+          tz.transition 2019, 11, :o1, 1572764400
+          tz.transition 2020, 3, :o2, 1583654400
+          tz.transition 2020, 11, :o1, 1604214000
+          tz.transition 2021, 3, :o2, 1615708800
+          tz.transition 2021, 11, :o1, 1636268400
+          tz.transition 2022, 3, :o2, 1647158400
+          tz.transition 2022, 11, :o1, 1667718000
+          tz.transition 2023, 3, :o2, 1678608000
+          tz.transition 2023, 11, :o1, 1699167600
+          tz.transition 2024, 3, :o2, 1710057600
+          tz.transition 2024, 11, :o1, 1730617200
+          tz.transition 2025, 3, :o2, 1741507200
+          tz.transition 2025, 11, :o1, 1762066800
+          tz.transition 2026, 3, :o2, 1772956800
+          tz.transition 2026, 11, :o1, 1793516400
+          tz.transition 2027, 3, :o2, 1805011200
+          tz.transition 2027, 11, :o1, 1825570800
+          tz.transition 2028, 3, :o2, 1836460800
+          tz.transition 2028, 11, :o1, 1857020400
+          tz.transition 2029, 3, :o2, 1867910400
+          tz.transition 2029, 11, :o1, 1888470000
+          tz.transition 2030, 3, :o2, 1899360000
+          tz.transition 2030, 11, :o1, 1919919600
+          tz.transition 2031, 3, :o2, 1930809600
+          tz.transition 2031, 11, :o1, 1951369200
+          tz.transition 2032, 3, :o2, 1962864000
+          tz.transition 2032, 11, :o1, 1983423600
+          tz.transition 2033, 3, :o2, 1994313600
+          tz.transition 2033, 11, :o1, 2014873200
+          tz.transition 2034, 3, :o2, 2025763200
+          tz.transition 2034, 11, :o1, 2046322800
+          tz.transition 2035, 3, :o2, 2057212800
+          tz.transition 2035, 11, :o1, 2077772400
+          tz.transition 2036, 3, :o2, 2088662400
+          tz.transition 2036, 11, :o1, 2109222000
+          tz.transition 2037, 3, :o2, 2120112000
+          tz.transition 2037, 11, :o1, 2140671600
+          tz.transition 2038, 3, :o2, 14792981, 6
+          tz.transition 2038, 11, :o1, 59177635, 24
+          tz.transition 2039, 3, :o2, 14795165, 6
+          tz.transition 2039, 11, :o1, 59186371, 24
+          tz.transition 2040, 3, :o2, 14797349, 6
+          tz.transition 2040, 11, :o1, 59195107, 24
+          tz.transition 2041, 3, :o2, 14799533, 6
+          tz.transition 2041, 11, :o1, 59203843, 24
+          tz.transition 2042, 3, :o2, 14801717, 6
+          tz.transition 2042, 11, :o1, 59212579, 24
+          tz.transition 2043, 3, :o2, 14803901, 6
+          tz.transition 2043, 11, :o1, 59221315, 24
+          tz.transition 2044, 3, :o2, 14806127, 6
+          tz.transition 2044, 11, :o1, 59230219, 24
+          tz.transition 2045, 3, :o2, 14808311, 6
+          tz.transition 2045, 11, :o1, 59238955, 24
+          tz.transition 2046, 3, :o2, 14810495, 6
+          tz.transition 2046, 11, :o1, 59247691, 24
+          tz.transition 2047, 3, :o2, 14812679, 6
+          tz.transition 2047, 11, :o1, 59256427, 24
+          tz.transition 2048, 3, :o2, 14814863, 6
+          tz.transition 2048, 11, :o1, 59265163, 24
+          tz.transition 2049, 3, :o2, 14817089, 6
+          tz.transition 2049, 11, :o1, 59274067, 24
+          tz.transition 2050, 3, :o2, 14819273, 6
+          tz.transition 2050, 11, :o1, 59282803, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chihuahua.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chihuahua.rb
new file mode 100644
index 00000000..1710b57c
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chihuahua.rb
@@ -0,0 +1,136 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Chihuahua
+        include TimezoneDefinition
+        
+        timezone 'America/Chihuahua' do |tz|
+          tz.offset :o0, -25460, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -21600, 0, :CST
+          tz.offset :o3, -21600, 3600, :CDT
+          tz.offset :o4, -25200, 3600, :MDT
+          
+          tz.transition 1922, 1, :o1, 58153339, 24
+          tz.transition 1927, 6, :o2, 9700171, 4
+          tz.transition 1930, 11, :o1, 9705183, 4
+          tz.transition 1931, 5, :o2, 9705855, 4
+          tz.transition 1931, 10, :o1, 9706463, 4
+          tz.transition 1932, 4, :o2, 58243171, 24
+          tz.transition 1996, 4, :o3, 828864000
+          tz.transition 1996, 10, :o2, 846399600
+          tz.transition 1997, 4, :o3, 860313600
+          tz.transition 1997, 10, :o2, 877849200
+          tz.transition 1998, 4, :o4, 891766800
+          tz.transition 1998, 10, :o1, 909302400
+          tz.transition 1999, 4, :o4, 923216400
+          tz.transition 1999, 10, :o1, 941356800
+          tz.transition 2000, 4, :o4, 954666000
+          tz.transition 2000, 10, :o1, 972806400
+          tz.transition 2001, 5, :o4, 989139600
+          tz.transition 2001, 9, :o1, 1001836800
+          tz.transition 2002, 4, :o4, 1018170000
+          tz.transition 2002, 10, :o1, 1035705600
+          tz.transition 2003, 4, :o4, 1049619600
+          tz.transition 2003, 10, :o1, 1067155200
+          tz.transition 2004, 4, :o4, 1081069200
+          tz.transition 2004, 10, :o1, 1099209600
+          tz.transition 2005, 4, :o4, 1112518800
+          tz.transition 2005, 10, :o1, 1130659200
+          tz.transition 2006, 4, :o4, 1143968400
+          tz.transition 2006, 10, :o1, 1162108800
+          tz.transition 2007, 4, :o4, 1175418000
+          tz.transition 2007, 10, :o1, 1193558400
+          tz.transition 2008, 4, :o4, 1207472400
+          tz.transition 2008, 10, :o1, 1225008000
+          tz.transition 2009, 4, :o4, 1238922000
+          tz.transition 2009, 10, :o1, 1256457600
+          tz.transition 2010, 4, :o4, 1270371600
+          tz.transition 2010, 10, :o1, 1288512000
+          tz.transition 2011, 4, :o4, 1301821200
+          tz.transition 2011, 10, :o1, 1319961600
+          tz.transition 2012, 4, :o4, 1333270800
+          tz.transition 2012, 10, :o1, 1351411200
+          tz.transition 2013, 4, :o4, 1365325200
+          tz.transition 2013, 10, :o1, 1382860800
+          tz.transition 2014, 4, :o4, 1396774800
+          tz.transition 2014, 10, :o1, 1414310400
+          tz.transition 2015, 4, :o4, 1428224400
+          tz.transition 2015, 10, :o1, 1445760000
+          tz.transition 2016, 4, :o4, 1459674000
+          tz.transition 2016, 10, :o1, 1477814400
+          tz.transition 2017, 4, :o4, 1491123600
+          tz.transition 2017, 10, :o1, 1509264000
+          tz.transition 2018, 4, :o4, 1522573200
+          tz.transition 2018, 10, :o1, 1540713600
+          tz.transition 2019, 4, :o4, 1554627600
+          tz.transition 2019, 10, :o1, 1572163200
+          tz.transition 2020, 4, :o4, 1586077200
+          tz.transition 2020, 10, :o1, 1603612800
+          tz.transition 2021, 4, :o4, 1617526800
+          tz.transition 2021, 10, :o1, 1635667200
+          tz.transition 2022, 4, :o4, 1648976400
+          tz.transition 2022, 10, :o1, 1667116800
+          tz.transition 2023, 4, :o4, 1680426000
+          tz.transition 2023, 10, :o1, 1698566400
+          tz.transition 2024, 4, :o4, 1712480400
+          tz.transition 2024, 10, :o1, 1730016000
+          tz.transition 2025, 4, :o4, 1743930000
+          tz.transition 2025, 10, :o1, 1761465600
+          tz.transition 2026, 4, :o4, 1775379600
+          tz.transition 2026, 10, :o1, 1792915200
+          tz.transition 2027, 4, :o4, 1806829200
+          tz.transition 2027, 10, :o1, 1824969600
+          tz.transition 2028, 4, :o4, 1838278800
+          tz.transition 2028, 10, :o1, 1856419200
+          tz.transition 2029, 4, :o4, 1869728400
+          tz.transition 2029, 10, :o1, 1887868800
+          tz.transition 2030, 4, :o4, 1901782800
+          tz.transition 2030, 10, :o1, 1919318400
+          tz.transition 2031, 4, :o4, 1933232400
+          tz.transition 2031, 10, :o1, 1950768000
+          tz.transition 2032, 4, :o4, 1964682000
+          tz.transition 2032, 10, :o1, 1982822400
+          tz.transition 2033, 4, :o4, 1996131600
+          tz.transition 2033, 10, :o1, 2014272000
+          tz.transition 2034, 4, :o4, 2027581200
+          tz.transition 2034, 10, :o1, 2045721600
+          tz.transition 2035, 4, :o4, 2059030800
+          tz.transition 2035, 10, :o1, 2077171200
+          tz.transition 2036, 4, :o4, 2091085200
+          tz.transition 2036, 10, :o1, 2108620800
+          tz.transition 2037, 4, :o4, 2122534800
+          tz.transition 2037, 10, :o1, 2140070400
+          tz.transition 2038, 4, :o4, 19724143, 8
+          tz.transition 2038, 10, :o1, 14794367, 6
+          tz.transition 2039, 4, :o4, 19727055, 8
+          tz.transition 2039, 10, :o1, 14796551, 6
+          tz.transition 2040, 4, :o4, 19729967, 8
+          tz.transition 2040, 10, :o1, 14798735, 6
+          tz.transition 2041, 4, :o4, 19732935, 8
+          tz.transition 2041, 10, :o1, 14800919, 6
+          tz.transition 2042, 4, :o4, 19735847, 8
+          tz.transition 2042, 10, :o1, 14803103, 6
+          tz.transition 2043, 4, :o4, 19738759, 8
+          tz.transition 2043, 10, :o1, 14805287, 6
+          tz.transition 2044, 4, :o4, 19741671, 8
+          tz.transition 2044, 10, :o1, 14807513, 6
+          tz.transition 2045, 4, :o4, 19744583, 8
+          tz.transition 2045, 10, :o1, 14809697, 6
+          tz.transition 2046, 4, :o4, 19747495, 8
+          tz.transition 2046, 10, :o1, 14811881, 6
+          tz.transition 2047, 4, :o4, 19750463, 8
+          tz.transition 2047, 10, :o1, 14814065, 6
+          tz.transition 2048, 4, :o4, 19753375, 8
+          tz.transition 2048, 10, :o1, 14816249, 6
+          tz.transition 2049, 4, :o4, 19756287, 8
+          tz.transition 2049, 10, :o1, 14818475, 6
+          tz.transition 2050, 4, :o4, 19759199, 8
+          tz.transition 2050, 10, :o1, 14820659, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Denver.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Denver.rb
new file mode 100644
index 00000000..1c1efb5f
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Denver.rb
@@ -0,0 +1,204 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Denver
+        include TimezoneDefinition
+        
+        timezone 'America/Denver' do |tz|
+          tz.offset :o0, -25196, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -25200, 3600, :MDT
+          tz.offset :o3, -25200, 3600, :MWT
+          tz.offset :o4, -25200, 3600, :MPT
+          
+          tz.transition 1883, 11, :o1, 57819199, 24
+          tz.transition 1918, 3, :o2, 19373471, 8
+          tz.transition 1918, 10, :o1, 14531363, 6
+          tz.transition 1919, 3, :o2, 19376383, 8
+          tz.transition 1919, 10, :o1, 14533547, 6
+          tz.transition 1920, 3, :o2, 19379295, 8
+          tz.transition 1920, 10, :o1, 14535773, 6
+          tz.transition 1921, 3, :o2, 19382207, 8
+          tz.transition 1921, 5, :o1, 14536991, 6
+          tz.transition 1942, 2, :o3, 19443199, 8
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o1, 14590373, 6
+          tz.transition 1965, 4, :o2, 19511007, 8
+          tz.transition 1965, 10, :o1, 14634389, 6
+          tz.transition 1966, 4, :o2, 19513919, 8
+          tz.transition 1966, 10, :o1, 14636573, 6
+          tz.transition 1967, 4, :o2, 19516887, 8
+          tz.transition 1967, 10, :o1, 14638757, 6
+          tz.transition 1968, 4, :o2, 19519799, 8
+          tz.transition 1968, 10, :o1, 14640941, 6
+          tz.transition 1969, 4, :o2, 19522711, 8
+          tz.transition 1969, 10, :o1, 14643125, 6
+          tz.transition 1970, 4, :o2, 9968400
+          tz.transition 1970, 10, :o1, 25689600
+          tz.transition 1971, 4, :o2, 41418000
+          tz.transition 1971, 10, :o1, 57744000
+          tz.transition 1972, 4, :o2, 73472400
+          tz.transition 1972, 10, :o1, 89193600
+          tz.transition 1973, 4, :o2, 104922000
+          tz.transition 1973, 10, :o1, 120643200
+          tz.transition 1974, 1, :o2, 126694800
+          tz.transition 1974, 10, :o1, 152092800
+          tz.transition 1975, 2, :o2, 162378000
+          tz.transition 1975, 10, :o1, 183542400
+          tz.transition 1976, 4, :o2, 199270800
+          tz.transition 1976, 10, :o1, 215596800
+          tz.transition 1977, 4, :o2, 230720400
+          tz.transition 1977, 10, :o1, 247046400
+          tz.transition 1978, 4, :o2, 262774800
+          tz.transition 1978, 10, :o1, 278496000
+          tz.transition 1979, 4, :o2, 294224400
+          tz.transition 1979, 10, :o1, 309945600
+          tz.transition 1980, 4, :o2, 325674000
+          tz.transition 1980, 10, :o1, 341395200
+          tz.transition 1981, 4, :o2, 357123600
+          tz.transition 1981, 10, :o1, 372844800
+          tz.transition 1982, 4, :o2, 388573200
+          tz.transition 1982, 10, :o1, 404899200
+          tz.transition 1983, 4, :o2, 420022800
+          tz.transition 1983, 10, :o1, 436348800
+          tz.transition 1984, 4, :o2, 452077200
+          tz.transition 1984, 10, :o1, 467798400
+          tz.transition 1985, 4, :o2, 483526800
+          tz.transition 1985, 10, :o1, 499248000
+          tz.transition 1986, 4, :o2, 514976400
+          tz.transition 1986, 10, :o1, 530697600
+          tz.transition 1987, 4, :o2, 544611600
+          tz.transition 1987, 10, :o1, 562147200
+          tz.transition 1988, 4, :o2, 576061200
+          tz.transition 1988, 10, :o1, 594201600
+          tz.transition 1989, 4, :o2, 607510800
+          tz.transition 1989, 10, :o1, 625651200
+          tz.transition 1990, 4, :o2, 638960400
+          tz.transition 1990, 10, :o1, 657100800
+          tz.transition 1991, 4, :o2, 671014800
+          tz.transition 1991, 10, :o1, 688550400
+          tz.transition 1992, 4, :o2, 702464400
+          tz.transition 1992, 10, :o1, 720000000
+          tz.transition 1993, 4, :o2, 733914000
+          tz.transition 1993, 10, :o1, 752054400
+          tz.transition 1994, 4, :o2, 765363600
+          tz.transition 1994, 10, :o1, 783504000
+          tz.transition 1995, 4, :o2, 796813200
+          tz.transition 1995, 10, :o1, 814953600
+          tz.transition 1996, 4, :o2, 828867600
+          tz.transition 1996, 10, :o1, 846403200
+          tz.transition 1997, 4, :o2, 860317200
+          tz.transition 1997, 10, :o1, 877852800
+          tz.transition 1998, 4, :o2, 891766800
+          tz.transition 1998, 10, :o1, 909302400
+          tz.transition 1999, 4, :o2, 923216400
+          tz.transition 1999, 10, :o1, 941356800
+          tz.transition 2000, 4, :o2, 954666000
+          tz.transition 2000, 10, :o1, 972806400
+          tz.transition 2001, 4, :o2, 986115600
+          tz.transition 2001, 10, :o1, 1004256000
+          tz.transition 2002, 4, :o2, 1018170000
+          tz.transition 2002, 10, :o1, 1035705600
+          tz.transition 2003, 4, :o2, 1049619600
+          tz.transition 2003, 10, :o1, 1067155200
+          tz.transition 2004, 4, :o2, 1081069200
+          tz.transition 2004, 10, :o1, 1099209600
+          tz.transition 2005, 4, :o2, 1112518800
+          tz.transition 2005, 10, :o1, 1130659200
+          tz.transition 2006, 4, :o2, 1143968400
+          tz.transition 2006, 10, :o1, 1162108800
+          tz.transition 2007, 3, :o2, 1173603600
+          tz.transition 2007, 11, :o1, 1194163200
+          tz.transition 2008, 3, :o2, 1205053200
+          tz.transition 2008, 11, :o1, 1225612800
+          tz.transition 2009, 3, :o2, 1236502800
+          tz.transition 2009, 11, :o1, 1257062400
+          tz.transition 2010, 3, :o2, 1268557200
+          tz.transition 2010, 11, :o1, 1289116800
+          tz.transition 2011, 3, :o2, 1300006800
+          tz.transition 2011, 11, :o1, 1320566400
+          tz.transition 2012, 3, :o2, 1331456400
+          tz.transition 2012, 11, :o1, 1352016000
+          tz.transition 2013, 3, :o2, 1362906000
+          tz.transition 2013, 11, :o1, 1383465600
+          tz.transition 2014, 3, :o2, 1394355600
+          tz.transition 2014, 11, :o1, 1414915200
+          tz.transition 2015, 3, :o2, 1425805200
+          tz.transition 2015, 11, :o1, 1446364800
+          tz.transition 2016, 3, :o2, 1457859600
+          tz.transition 2016, 11, :o1, 1478419200
+          tz.transition 2017, 3, :o2, 1489309200
+          tz.transition 2017, 11, :o1, 1509868800
+          tz.transition 2018, 3, :o2, 1520758800
+          tz.transition 2018, 11, :o1, 1541318400
+          tz.transition 2019, 3, :o2, 1552208400
+          tz.transition 2019, 11, :o1, 1572768000
+          tz.transition 2020, 3, :o2, 1583658000
+          tz.transition 2020, 11, :o1, 1604217600
+          tz.transition 2021, 3, :o2, 1615712400
+          tz.transition 2021, 11, :o1, 1636272000
+          tz.transition 2022, 3, :o2, 1647162000
+          tz.transition 2022, 11, :o1, 1667721600
+          tz.transition 2023, 3, :o2, 1678611600
+          tz.transition 2023, 11, :o1, 1699171200
+          tz.transition 2024, 3, :o2, 1710061200
+          tz.transition 2024, 11, :o1, 1730620800
+          tz.transition 2025, 3, :o2, 1741510800
+          tz.transition 2025, 11, :o1, 1762070400
+          tz.transition 2026, 3, :o2, 1772960400
+          tz.transition 2026, 11, :o1, 1793520000
+          tz.transition 2027, 3, :o2, 1805014800
+          tz.transition 2027, 11, :o1, 1825574400
+          tz.transition 2028, 3, :o2, 1836464400
+          tz.transition 2028, 11, :o1, 1857024000
+          tz.transition 2029, 3, :o2, 1867914000
+          tz.transition 2029, 11, :o1, 1888473600
+          tz.transition 2030, 3, :o2, 1899363600
+          tz.transition 2030, 11, :o1, 1919923200
+          tz.transition 2031, 3, :o2, 1930813200
+          tz.transition 2031, 11, :o1, 1951372800
+          tz.transition 2032, 3, :o2, 1962867600
+          tz.transition 2032, 11, :o1, 1983427200
+          tz.transition 2033, 3, :o2, 1994317200
+          tz.transition 2033, 11, :o1, 2014876800
+          tz.transition 2034, 3, :o2, 2025766800
+          tz.transition 2034, 11, :o1, 2046326400
+          tz.transition 2035, 3, :o2, 2057216400
+          tz.transition 2035, 11, :o1, 2077776000
+          tz.transition 2036, 3, :o2, 2088666000
+          tz.transition 2036, 11, :o1, 2109225600
+          tz.transition 2037, 3, :o2, 2120115600
+          tz.transition 2037, 11, :o1, 2140675200
+          tz.transition 2038, 3, :o2, 19723975, 8
+          tz.transition 2038, 11, :o1, 14794409, 6
+          tz.transition 2039, 3, :o2, 19726887, 8
+          tz.transition 2039, 11, :o1, 14796593, 6
+          tz.transition 2040, 3, :o2, 19729799, 8
+          tz.transition 2040, 11, :o1, 14798777, 6
+          tz.transition 2041, 3, :o2, 19732711, 8
+          tz.transition 2041, 11, :o1, 14800961, 6
+          tz.transition 2042, 3, :o2, 19735623, 8
+          tz.transition 2042, 11, :o1, 14803145, 6
+          tz.transition 2043, 3, :o2, 19738535, 8
+          tz.transition 2043, 11, :o1, 14805329, 6
+          tz.transition 2044, 3, :o2, 19741503, 8
+          tz.transition 2044, 11, :o1, 14807555, 6
+          tz.transition 2045, 3, :o2, 19744415, 8
+          tz.transition 2045, 11, :o1, 14809739, 6
+          tz.transition 2046, 3, :o2, 19747327, 8
+          tz.transition 2046, 11, :o1, 14811923, 6
+          tz.transition 2047, 3, :o2, 19750239, 8
+          tz.transition 2047, 11, :o1, 14814107, 6
+          tz.transition 2048, 3, :o2, 19753151, 8
+          tz.transition 2048, 11, :o1, 14816291, 6
+          tz.transition 2049, 3, :o2, 19756119, 8
+          tz.transition 2049, 11, :o1, 14818517, 6
+          tz.transition 2050, 3, :o2, 19759031, 8
+          tz.transition 2050, 11, :o1, 14820701, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Godthab.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Godthab.rb
new file mode 100644
index 00000000..1e05518b
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Godthab.rb
@@ -0,0 +1,161 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Godthab
+        include TimezoneDefinition
+        
+        timezone 'America/Godthab' do |tz|
+          tz.offset :o0, -12416, 0, :LMT
+          tz.offset :o1, -10800, 0, :WGT
+          tz.offset :o2, -10800, 3600, :WGST
+          
+          tz.transition 1916, 7, :o1, 3268448069, 1350
+          tz.transition 1980, 4, :o2, 323845200
+          tz.transition 1980, 9, :o1, 338950800
+          tz.transition 1981, 3, :o2, 354675600
+          tz.transition 1981, 9, :o1, 370400400
+          tz.transition 1982, 3, :o2, 386125200
+          tz.transition 1982, 9, :o1, 401850000
+          tz.transition 1983, 3, :o2, 417574800
+          tz.transition 1983, 9, :o1, 433299600
+          tz.transition 1984, 3, :o2, 449024400
+          tz.transition 1984, 9, :o1, 465354000
+          tz.transition 1985, 3, :o2, 481078800
+          tz.transition 1985, 9, :o1, 496803600
+          tz.transition 1986, 3, :o2, 512528400
+          tz.transition 1986, 9, :o1, 528253200
+          tz.transition 1987, 3, :o2, 543978000
+          tz.transition 1987, 9, :o1, 559702800
+          tz.transition 1988, 3, :o2, 575427600
+          tz.transition 1988, 9, :o1, 591152400
+          tz.transition 1989, 3, :o2, 606877200
+          tz.transition 1989, 9, :o1, 622602000
+          tz.transition 1990, 3, :o2, 638326800
+          tz.transition 1990, 9, :o1, 654656400
+          tz.transition 1991, 3, :o2, 670381200
+          tz.transition 1991, 9, :o1, 686106000
+          tz.transition 1992, 3, :o2, 701830800
+          tz.transition 1992, 9, :o1, 717555600
+          tz.transition 1993, 3, :o2, 733280400
+          tz.transition 1993, 9, :o1, 749005200
+          tz.transition 1994, 3, :o2, 764730000
+          tz.transition 1994, 9, :o1, 780454800
+          tz.transition 1995, 3, :o2, 796179600
+          tz.transition 1995, 9, :o1, 811904400
+          tz.transition 1996, 3, :o2, 828234000
+          tz.transition 1996, 10, :o1, 846378000
+          tz.transition 1997, 3, :o2, 859683600
+          tz.transition 1997, 10, :o1, 877827600
+          tz.transition 1998, 3, :o2, 891133200
+          tz.transition 1998, 10, :o1, 909277200
+          tz.transition 1999, 3, :o2, 922582800
+          tz.transition 1999, 10, :o1, 941331600
+          tz.transition 2000, 3, :o2, 954032400
+          tz.transition 2000, 10, :o1, 972781200
+          tz.transition 2001, 3, :o2, 985482000
+          tz.transition 2001, 10, :o1, 1004230800
+          tz.transition 2002, 3, :o2, 1017536400
+          tz.transition 2002, 10, :o1, 1035680400
+          tz.transition 2003, 3, :o2, 1048986000
+          tz.transition 2003, 10, :o1, 1067130000
+          tz.transition 2004, 3, :o2, 1080435600
+          tz.transition 2004, 10, :o1, 1099184400
+          tz.transition 2005, 3, :o2, 1111885200
+          tz.transition 2005, 10, :o1, 1130634000
+          tz.transition 2006, 3, :o2, 1143334800
+          tz.transition 2006, 10, :o1, 1162083600
+          tz.transition 2007, 3, :o2, 1174784400
+          tz.transition 2007, 10, :o1, 1193533200
+          tz.transition 2008, 3, :o2, 1206838800
+          tz.transition 2008, 10, :o1, 1224982800
+          tz.transition 2009, 3, :o2, 1238288400
+          tz.transition 2009, 10, :o1, 1256432400
+          tz.transition 2010, 3, :o2, 1269738000
+          tz.transition 2010, 10, :o1, 1288486800
+          tz.transition 2011, 3, :o2, 1301187600
+          tz.transition 2011, 10, :o1, 1319936400
+          tz.transition 2012, 3, :o2, 1332637200
+          tz.transition 2012, 10, :o1, 1351386000
+          tz.transition 2013, 3, :o2, 1364691600
+          tz.transition 2013, 10, :o1, 1382835600
+          tz.transition 2014, 3, :o2, 1396141200
+          tz.transition 2014, 10, :o1, 1414285200
+          tz.transition 2015, 3, :o2, 1427590800
+          tz.transition 2015, 10, :o1, 1445734800
+          tz.transition 2016, 3, :o2, 1459040400
+          tz.transition 2016, 10, :o1, 1477789200
+          tz.transition 2017, 3, :o2, 1490490000
+          tz.transition 2017, 10, :o1, 1509238800
+          tz.transition 2018, 3, :o2, 1521939600
+          tz.transition 2018, 10, :o1, 1540688400
+          tz.transition 2019, 3, :o2, 1553994000
+          tz.transition 2019, 10, :o1, 1572138000
+          tz.transition 2020, 3, :o2, 1585443600
+          tz.transition 2020, 10, :o1, 1603587600
+          tz.transition 2021, 3, :o2, 1616893200
+          tz.transition 2021, 10, :o1, 1635642000
+          tz.transition 2022, 3, :o2, 1648342800
+          tz.transition 2022, 10, :o1, 1667091600
+          tz.transition 2023, 3, :o2, 1679792400
+          tz.transition 2023, 10, :o1, 1698541200
+          tz.transition 2024, 3, :o2, 1711846800
+          tz.transition 2024, 10, :o1, 1729990800
+          tz.transition 2025, 3, :o2, 1743296400
+          tz.transition 2025, 10, :o1, 1761440400
+          tz.transition 2026, 3, :o2, 1774746000
+          tz.transition 2026, 10, :o1, 1792890000
+          tz.transition 2027, 3, :o2, 1806195600
+          tz.transition 2027, 10, :o1, 1824944400
+          tz.transition 2028, 3, :o2, 1837645200
+          tz.transition 2028, 10, :o1, 1856394000
+          tz.transition 2029, 3, :o2, 1869094800
+          tz.transition 2029, 10, :o1, 1887843600
+          tz.transition 2030, 3, :o2, 1901149200
+          tz.transition 2030, 10, :o1, 1919293200
+          tz.transition 2031, 3, :o2, 1932598800
+          tz.transition 2031, 10, :o1, 1950742800
+          tz.transition 2032, 3, :o2, 1964048400
+          tz.transition 2032, 10, :o1, 1982797200
+          tz.transition 2033, 3, :o2, 1995498000
+          tz.transition 2033, 10, :o1, 2014246800
+          tz.transition 2034, 3, :o2, 2026947600
+          tz.transition 2034, 10, :o1, 2045696400
+          tz.transition 2035, 3, :o2, 2058397200
+          tz.transition 2035, 10, :o1, 2077146000
+          tz.transition 2036, 3, :o2, 2090451600
+          tz.transition 2036, 10, :o1, 2108595600
+          tz.transition 2037, 3, :o2, 2121901200
+          tz.transition 2037, 10, :o1, 2140045200
+          tz.transition 2038, 3, :o2, 59172253, 24
+          tz.transition 2038, 10, :o1, 59177461, 24
+          tz.transition 2039, 3, :o2, 59180989, 24
+          tz.transition 2039, 10, :o1, 59186197, 24
+          tz.transition 2040, 3, :o2, 59189725, 24
+          tz.transition 2040, 10, :o1, 59194933, 24
+          tz.transition 2041, 3, :o2, 59198629, 24
+          tz.transition 2041, 10, :o1, 59203669, 24
+          tz.transition 2042, 3, :o2, 59207365, 24
+          tz.transition 2042, 10, :o1, 59212405, 24
+          tz.transition 2043, 3, :o2, 59216101, 24
+          tz.transition 2043, 10, :o1, 59221141, 24
+          tz.transition 2044, 3, :o2, 59224837, 24
+          tz.transition 2044, 10, :o1, 59230045, 24
+          tz.transition 2045, 3, :o2, 59233573, 24
+          tz.transition 2045, 10, :o1, 59238781, 24
+          tz.transition 2046, 3, :o2, 59242309, 24
+          tz.transition 2046, 10, :o1, 59247517, 24
+          tz.transition 2047, 3, :o2, 59251213, 24
+          tz.transition 2047, 10, :o1, 59256253, 24
+          tz.transition 2048, 3, :o2, 59259949, 24
+          tz.transition 2048, 10, :o1, 59264989, 24
+          tz.transition 2049, 3, :o2, 59268685, 24
+          tz.transition 2049, 10, :o1, 59273893, 24
+          tz.transition 2050, 3, :o2, 59277421, 24
+          tz.transition 2050, 10, :o1, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Guatemala.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Guatemala.rb
new file mode 100644
index 00000000..a2bf7340
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Guatemala.rb
@@ -0,0 +1,27 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Guatemala
+        include TimezoneDefinition
+        
+        timezone 'America/Guatemala' do |tz|
+          tz.offset :o0, -21724, 0, :LMT
+          tz.offset :o1, -21600, 0, :CST
+          tz.offset :o2, -21600, 3600, :CDT
+          
+          tz.transition 1918, 10, :o1, 52312429831, 21600
+          tz.transition 1973, 11, :o2, 123055200
+          tz.transition 1974, 2, :o1, 130914000
+          tz.transition 1983, 5, :o2, 422344800
+          tz.transition 1983, 9, :o1, 433054800
+          tz.transition 1991, 3, :o2, 669708000
+          tz.transition 1991, 9, :o1, 684219600
+          tz.transition 2006, 4, :o2, 1146376800
+          tz.transition 2006, 10, :o1, 1159678800
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Halifax.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Halifax.rb
new file mode 100644
index 00000000..d25ae775
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Halifax.rb
@@ -0,0 +1,274 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Halifax
+        include TimezoneDefinition
+        
+        timezone 'America/Halifax' do |tz|
+          tz.offset :o0, -15264, 0, :LMT
+          tz.offset :o1, -14400, 0, :AST
+          tz.offset :o2, -14400, 3600, :ADT
+          tz.offset :o3, -14400, 3600, :AWT
+          tz.offset :o4, -14400, 3600, :APT
+          
+          tz.transition 1902, 6, :o1, 724774703, 300
+          tz.transition 1916, 4, :o2, 7262864, 3
+          tz.transition 1916, 10, :o1, 19369101, 8
+          tz.transition 1918, 4, :o2, 9686791, 4
+          tz.transition 1918, 10, :o1, 58125545, 24
+          tz.transition 1920, 5, :o2, 7267361, 3
+          tz.transition 1920, 8, :o1, 19380525, 8
+          tz.transition 1921, 5, :o2, 7268447, 3
+          tz.transition 1921, 9, :o1, 19383501, 8
+          tz.transition 1922, 4, :o2, 7269524, 3
+          tz.transition 1922, 9, :o1, 19386421, 8
+          tz.transition 1923, 5, :o2, 7270637, 3
+          tz.transition 1923, 9, :o1, 19389333, 8
+          tz.transition 1924, 5, :o2, 7271729, 3
+          tz.transition 1924, 9, :o1, 19392349, 8
+          tz.transition 1925, 5, :o2, 7272821, 3
+          tz.transition 1925, 9, :o1, 19395373, 8
+          tz.transition 1926, 5, :o2, 7273955, 3
+          tz.transition 1926, 9, :o1, 19398173, 8
+          tz.transition 1927, 5, :o2, 7275005, 3
+          tz.transition 1927, 9, :o1, 19401197, 8
+          tz.transition 1928, 5, :o2, 7276139, 3
+          tz.transition 1928, 9, :o1, 19403989, 8
+          tz.transition 1929, 5, :o2, 7277231, 3
+          tz.transition 1929, 9, :o1, 19406861, 8
+          tz.transition 1930, 5, :o2, 7278323, 3
+          tz.transition 1930, 9, :o1, 19409877, 8
+          tz.transition 1931, 5, :o2, 7279415, 3
+          tz.transition 1931, 9, :o1, 19412901, 8
+          tz.transition 1932, 5, :o2, 7280486, 3
+          tz.transition 1932, 9, :o1, 19415813, 8
+          tz.transition 1933, 4, :o2, 7281578, 3
+          tz.transition 1933, 10, :o1, 19418781, 8
+          tz.transition 1934, 5, :o2, 7282733, 3
+          tz.transition 1934, 9, :o1, 19421573, 8
+          tz.transition 1935, 6, :o2, 7283867, 3
+          tz.transition 1935, 9, :o1, 19424605, 8
+          tz.transition 1936, 6, :o2, 7284962, 3
+          tz.transition 1936, 9, :o1, 19427405, 8
+          tz.transition 1937, 5, :o2, 7285967, 3
+          tz.transition 1937, 9, :o1, 19430429, 8
+          tz.transition 1938, 5, :o2, 7287059, 3
+          tz.transition 1938, 9, :o1, 19433341, 8
+          tz.transition 1939, 5, :o2, 7288235, 3
+          tz.transition 1939, 9, :o1, 19436253, 8
+          tz.transition 1940, 5, :o2, 7289264, 3
+          tz.transition 1940, 9, :o1, 19439221, 8
+          tz.transition 1941, 5, :o2, 7290356, 3
+          tz.transition 1941, 9, :o1, 19442133, 8
+          tz.transition 1942, 2, :o3, 9721599, 4
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o1, 58361489, 24
+          tz.transition 1946, 4, :o2, 9727755, 4
+          tz.transition 1946, 9, :o1, 58370225, 24
+          tz.transition 1947, 4, :o2, 9729211, 4
+          tz.transition 1947, 9, :o1, 58378961, 24
+          tz.transition 1948, 4, :o2, 9730667, 4
+          tz.transition 1948, 9, :o1, 58387697, 24
+          tz.transition 1949, 4, :o2, 9732123, 4
+          tz.transition 1949, 9, :o1, 58396433, 24
+          tz.transition 1951, 4, :o2, 9735063, 4
+          tz.transition 1951, 9, :o1, 58414073, 24
+          tz.transition 1952, 4, :o2, 9736519, 4
+          tz.transition 1952, 9, :o1, 58422809, 24
+          tz.transition 1953, 4, :o2, 9737975, 4
+          tz.transition 1953, 9, :o1, 58431545, 24
+          tz.transition 1954, 4, :o2, 9739431, 4
+          tz.transition 1954, 9, :o1, 58440281, 24
+          tz.transition 1956, 4, :o2, 9742371, 4
+          tz.transition 1956, 9, :o1, 58457921, 24
+          tz.transition 1957, 4, :o2, 9743827, 4
+          tz.transition 1957, 9, :o1, 58466657, 24
+          tz.transition 1958, 4, :o2, 9745283, 4
+          tz.transition 1958, 9, :o1, 58475393, 24
+          tz.transition 1959, 4, :o2, 9746739, 4
+          tz.transition 1959, 9, :o1, 58484129, 24
+          tz.transition 1962, 4, :o2, 9751135, 4
+          tz.transition 1962, 10, :o1, 58511177, 24
+          tz.transition 1963, 4, :o2, 9752591, 4
+          tz.transition 1963, 10, :o1, 58519913, 24
+          tz.transition 1964, 4, :o2, 9754047, 4
+          tz.transition 1964, 10, :o1, 58528649, 24
+          tz.transition 1965, 4, :o2, 9755503, 4
+          tz.transition 1965, 10, :o1, 58537553, 24
+          tz.transition 1966, 4, :o2, 9756959, 4
+          tz.transition 1966, 10, :o1, 58546289, 24
+          tz.transition 1967, 4, :o2, 9758443, 4
+          tz.transition 1967, 10, :o1, 58555025, 24
+          tz.transition 1968, 4, :o2, 9759899, 4
+          tz.transition 1968, 10, :o1, 58563761, 24
+          tz.transition 1969, 4, :o2, 9761355, 4
+          tz.transition 1969, 10, :o1, 58572497, 24
+          tz.transition 1970, 4, :o2, 9957600
+          tz.transition 1970, 10, :o1, 25678800
+          tz.transition 1971, 4, :o2, 41407200
+          tz.transition 1971, 10, :o1, 57733200
+          tz.transition 1972, 4, :o2, 73461600
+          tz.transition 1972, 10, :o1, 89182800
+          tz.transition 1973, 4, :o2, 104911200
+          tz.transition 1973, 10, :o1, 120632400
+          tz.transition 1974, 4, :o2, 136360800
+          tz.transition 1974, 10, :o1, 152082000
+          tz.transition 1975, 4, :o2, 167810400
+          tz.transition 1975, 10, :o1, 183531600
+          tz.transition 1976, 4, :o2, 199260000
+          tz.transition 1976, 10, :o1, 215586000
+          tz.transition 1977, 4, :o2, 230709600
+          tz.transition 1977, 10, :o1, 247035600
+          tz.transition 1978, 4, :o2, 262764000
+          tz.transition 1978, 10, :o1, 278485200
+          tz.transition 1979, 4, :o2, 294213600
+          tz.transition 1979, 10, :o1, 309934800
+          tz.transition 1980, 4, :o2, 325663200
+          tz.transition 1980, 10, :o1, 341384400
+          tz.transition 1981, 4, :o2, 357112800
+          tz.transition 1981, 10, :o1, 372834000
+          tz.transition 1982, 4, :o2, 388562400
+          tz.transition 1982, 10, :o1, 404888400
+          tz.transition 1983, 4, :o2, 420012000
+          tz.transition 1983, 10, :o1, 436338000
+          tz.transition 1984, 4, :o2, 452066400
+          tz.transition 1984, 10, :o1, 467787600
+          tz.transition 1985, 4, :o2, 483516000
+          tz.transition 1985, 10, :o1, 499237200
+          tz.transition 1986, 4, :o2, 514965600
+          tz.transition 1986, 10, :o1, 530686800
+          tz.transition 1987, 4, :o2, 544600800
+          tz.transition 1987, 10, :o1, 562136400
+          tz.transition 1988, 4, :o2, 576050400
+          tz.transition 1988, 10, :o1, 594190800
+          tz.transition 1989, 4, :o2, 607500000
+          tz.transition 1989, 10, :o1, 625640400
+          tz.transition 1990, 4, :o2, 638949600
+          tz.transition 1990, 10, :o1, 657090000
+          tz.transition 1991, 4, :o2, 671004000
+          tz.transition 1991, 10, :o1, 688539600
+          tz.transition 1992, 4, :o2, 702453600
+          tz.transition 1992, 10, :o1, 719989200
+          tz.transition 1993, 4, :o2, 733903200
+          tz.transition 1993, 10, :o1, 752043600
+          tz.transition 1994, 4, :o2, 765352800
+          tz.transition 1994, 10, :o1, 783493200
+          tz.transition 1995, 4, :o2, 796802400
+          tz.transition 1995, 10, :o1, 814942800
+          tz.transition 1996, 4, :o2, 828856800
+          tz.transition 1996, 10, :o1, 846392400
+          tz.transition 1997, 4, :o2, 860306400
+          tz.transition 1997, 10, :o1, 877842000
+          tz.transition 1998, 4, :o2, 891756000
+          tz.transition 1998, 10, :o1, 909291600
+          tz.transition 1999, 4, :o2, 923205600
+          tz.transition 1999, 10, :o1, 941346000
+          tz.transition 2000, 4, :o2, 954655200
+          tz.transition 2000, 10, :o1, 972795600
+          tz.transition 2001, 4, :o2, 986104800
+          tz.transition 2001, 10, :o1, 1004245200
+          tz.transition 2002, 4, :o2, 1018159200
+          tz.transition 2002, 10, :o1, 1035694800
+          tz.transition 2003, 4, :o2, 1049608800
+          tz.transition 2003, 10, :o1, 1067144400
+          tz.transition 2004, 4, :o2, 1081058400
+          tz.transition 2004, 10, :o1, 1099198800
+          tz.transition 2005, 4, :o2, 1112508000
+          tz.transition 2005, 10, :o1, 1130648400
+          tz.transition 2006, 4, :o2, 1143957600
+          tz.transition 2006, 10, :o1, 1162098000
+          tz.transition 2007, 3, :o2, 1173592800
+          tz.transition 2007, 11, :o1, 1194152400
+          tz.transition 2008, 3, :o2, 1205042400
+          tz.transition 2008, 11, :o1, 1225602000
+          tz.transition 2009, 3, :o2, 1236492000
+          tz.transition 2009, 11, :o1, 1257051600
+          tz.transition 2010, 3, :o2, 1268546400
+          tz.transition 2010, 11, :o1, 1289106000
+          tz.transition 2011, 3, :o2, 1299996000
+          tz.transition 2011, 11, :o1, 1320555600
+          tz.transition 2012, 3, :o2, 1331445600
+          tz.transition 2012, 11, :o1, 1352005200
+          tz.transition 2013, 3, :o2, 1362895200
+          tz.transition 2013, 11, :o1, 1383454800
+          tz.transition 2014, 3, :o2, 1394344800
+          tz.transition 2014, 11, :o1, 1414904400
+          tz.transition 2015, 3, :o2, 1425794400
+          tz.transition 2015, 11, :o1, 1446354000
+          tz.transition 2016, 3, :o2, 1457848800
+          tz.transition 2016, 11, :o1, 1478408400
+          tz.transition 2017, 3, :o2, 1489298400
+          tz.transition 2017, 11, :o1, 1509858000
+          tz.transition 2018, 3, :o2, 1520748000
+          tz.transition 2018, 11, :o1, 1541307600
+          tz.transition 2019, 3, :o2, 1552197600
+          tz.transition 2019, 11, :o1, 1572757200
+          tz.transition 2020, 3, :o2, 1583647200
+          tz.transition 2020, 11, :o1, 1604206800
+          tz.transition 2021, 3, :o2, 1615701600
+          tz.transition 2021, 11, :o1, 1636261200
+          tz.transition 2022, 3, :o2, 1647151200
+          tz.transition 2022, 11, :o1, 1667710800
+          tz.transition 2023, 3, :o2, 1678600800
+          tz.transition 2023, 11, :o1, 1699160400
+          tz.transition 2024, 3, :o2, 1710050400
+          tz.transition 2024, 11, :o1, 1730610000
+          tz.transition 2025, 3, :o2, 1741500000
+          tz.transition 2025, 11, :o1, 1762059600
+          tz.transition 2026, 3, :o2, 1772949600
+          tz.transition 2026, 11, :o1, 1793509200
+          tz.transition 2027, 3, :o2, 1805004000
+          tz.transition 2027, 11, :o1, 1825563600
+          tz.transition 2028, 3, :o2, 1836453600
+          tz.transition 2028, 11, :o1, 1857013200
+          tz.transition 2029, 3, :o2, 1867903200
+          tz.transition 2029, 11, :o1, 1888462800
+          tz.transition 2030, 3, :o2, 1899352800
+          tz.transition 2030, 11, :o1, 1919912400
+          tz.transition 2031, 3, :o2, 1930802400
+          tz.transition 2031, 11, :o1, 1951362000
+          tz.transition 2032, 3, :o2, 1962856800
+          tz.transition 2032, 11, :o1, 1983416400
+          tz.transition 2033, 3, :o2, 1994306400
+          tz.transition 2033, 11, :o1, 2014866000
+          tz.transition 2034, 3, :o2, 2025756000
+          tz.transition 2034, 11, :o1, 2046315600
+          tz.transition 2035, 3, :o2, 2057205600
+          tz.transition 2035, 11, :o1, 2077765200
+          tz.transition 2036, 3, :o2, 2088655200
+          tz.transition 2036, 11, :o1, 2109214800
+          tz.transition 2037, 3, :o2, 2120104800
+          tz.transition 2037, 11, :o1, 2140664400
+          tz.transition 2038, 3, :o2, 9861987, 4
+          tz.transition 2038, 11, :o1, 59177633, 24
+          tz.transition 2039, 3, :o2, 9863443, 4
+          tz.transition 2039, 11, :o1, 59186369, 24
+          tz.transition 2040, 3, :o2, 9864899, 4
+          tz.transition 2040, 11, :o1, 59195105, 24
+          tz.transition 2041, 3, :o2, 9866355, 4
+          tz.transition 2041, 11, :o1, 59203841, 24
+          tz.transition 2042, 3, :o2, 9867811, 4
+          tz.transition 2042, 11, :o1, 59212577, 24
+          tz.transition 2043, 3, :o2, 9869267, 4
+          tz.transition 2043, 11, :o1, 59221313, 24
+          tz.transition 2044, 3, :o2, 9870751, 4
+          tz.transition 2044, 11, :o1, 59230217, 24
+          tz.transition 2045, 3, :o2, 9872207, 4
+          tz.transition 2045, 11, :o1, 59238953, 24
+          tz.transition 2046, 3, :o2, 9873663, 4
+          tz.transition 2046, 11, :o1, 59247689, 24
+          tz.transition 2047, 3, :o2, 9875119, 4
+          tz.transition 2047, 11, :o1, 59256425, 24
+          tz.transition 2048, 3, :o2, 9876575, 4
+          tz.transition 2048, 11, :o1, 59265161, 24
+          tz.transition 2049, 3, :o2, 9878059, 4
+          tz.transition 2049, 11, :o1, 59274065, 24
+          tz.transition 2050, 3, :o2, 9879515, 4
+          tz.transition 2050, 11, :o1, 59282801, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Indiana/Indianapolis.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Indiana/Indianapolis.rb
new file mode 100644
index 00000000..f1430f6c
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Indiana/Indianapolis.rb
@@ -0,0 +1,149 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Indiana
+        module Indianapolis
+          include TimezoneDefinition
+          
+          timezone 'America/Indiana/Indianapolis' do |tz|
+            tz.offset :o0, -20678, 0, :LMT
+            tz.offset :o1, -21600, 0, :CST
+            tz.offset :o2, -21600, 3600, :CDT
+            tz.offset :o3, -21600, 3600, :CWT
+            tz.offset :o4, -21600, 3600, :CPT
+            tz.offset :o5, -18000, 0, :EST
+            tz.offset :o6, -18000, 3600, :EDT
+            
+            tz.transition 1883, 11, :o1, 9636533, 4
+            tz.transition 1918, 3, :o2, 14530103, 6
+            tz.transition 1918, 10, :o1, 58125451, 24
+            tz.transition 1919, 3, :o2, 14532287, 6
+            tz.transition 1919, 10, :o1, 58134187, 24
+            tz.transition 1941, 6, :o2, 14581007, 6
+            tz.transition 1941, 9, :o1, 58326379, 24
+            tz.transition 1942, 2, :o3, 14582399, 6
+            tz.transition 1945, 8, :o4, 58360379, 24
+            tz.transition 1945, 9, :o1, 58361491, 24
+            tz.transition 1946, 4, :o2, 14591633, 6
+            tz.transition 1946, 9, :o1, 58370227, 24
+            tz.transition 1947, 4, :o2, 14593817, 6
+            tz.transition 1947, 9, :o1, 58378963, 24
+            tz.transition 1948, 4, :o2, 14596001, 6
+            tz.transition 1948, 9, :o1, 58387699, 24
+            tz.transition 1949, 4, :o2, 14598185, 6
+            tz.transition 1949, 9, :o1, 58396435, 24
+            tz.transition 1950, 4, :o2, 14600411, 6
+            tz.transition 1950, 9, :o1, 58405171, 24
+            tz.transition 1951, 4, :o2, 14602595, 6
+            tz.transition 1951, 9, :o1, 58414075, 24
+            tz.transition 1952, 4, :o2, 14604779, 6
+            tz.transition 1952, 9, :o1, 58422811, 24
+            tz.transition 1953, 4, :o2, 14606963, 6
+            tz.transition 1953, 9, :o1, 58431547, 24
+            tz.transition 1954, 4, :o2, 14609147, 6
+            tz.transition 1954, 9, :o1, 58440283, 24
+            tz.transition 1955, 4, :o5, 14611331, 6
+            tz.transition 1957, 9, :o1, 58466659, 24
+            tz.transition 1958, 4, :o5, 14617925, 6
+            tz.transition 1969, 4, :o6, 58568131, 24
+            tz.transition 1969, 10, :o5, 9762083, 4
+            tz.transition 1970, 4, :o6, 9961200
+            tz.transition 1970, 10, :o5, 25682400
+            tz.transition 2006, 4, :o6, 1143961200
+            tz.transition 2006, 10, :o5, 1162101600
+            tz.transition 2007, 3, :o6, 1173596400
+            tz.transition 2007, 11, :o5, 1194156000
+            tz.transition 2008, 3, :o6, 1205046000
+            tz.transition 2008, 11, :o5, 1225605600
+            tz.transition 2009, 3, :o6, 1236495600
+            tz.transition 2009, 11, :o5, 1257055200
+            tz.transition 2010, 3, :o6, 1268550000
+            tz.transition 2010, 11, :o5, 1289109600
+            tz.transition 2011, 3, :o6, 1299999600
+            tz.transition 2011, 11, :o5, 1320559200
+            tz.transition 2012, 3, :o6, 1331449200
+            tz.transition 2012, 11, :o5, 1352008800
+            tz.transition 2013, 3, :o6, 1362898800
+            tz.transition 2013, 11, :o5, 1383458400
+            tz.transition 2014, 3, :o6, 1394348400
+            tz.transition 2014, 11, :o5, 1414908000
+            tz.transition 2015, 3, :o6, 1425798000
+            tz.transition 2015, 11, :o5, 1446357600
+            tz.transition 2016, 3, :o6, 1457852400
+            tz.transition 2016, 11, :o5, 1478412000
+            tz.transition 2017, 3, :o6, 1489302000
+            tz.transition 2017, 11, :o5, 1509861600
+            tz.transition 2018, 3, :o6, 1520751600
+            tz.transition 2018, 11, :o5, 1541311200
+            tz.transition 2019, 3, :o6, 1552201200
+            tz.transition 2019, 11, :o5, 1572760800
+            tz.transition 2020, 3, :o6, 1583650800
+            tz.transition 2020, 11, :o5, 1604210400
+            tz.transition 2021, 3, :o6, 1615705200
+            tz.transition 2021, 11, :o5, 1636264800
+            tz.transition 2022, 3, :o6, 1647154800
+            tz.transition 2022, 11, :o5, 1667714400
+            tz.transition 2023, 3, :o6, 1678604400
+            tz.transition 2023, 11, :o5, 1699164000
+            tz.transition 2024, 3, :o6, 1710054000
+            tz.transition 2024, 11, :o5, 1730613600
+            tz.transition 2025, 3, :o6, 1741503600
+            tz.transition 2025, 11, :o5, 1762063200
+            tz.transition 2026, 3, :o6, 1772953200
+            tz.transition 2026, 11, :o5, 1793512800
+            tz.transition 2027, 3, :o6, 1805007600
+            tz.transition 2027, 11, :o5, 1825567200
+            tz.transition 2028, 3, :o6, 1836457200
+            tz.transition 2028, 11, :o5, 1857016800
+            tz.transition 2029, 3, :o6, 1867906800
+            tz.transition 2029, 11, :o5, 1888466400
+            tz.transition 2030, 3, :o6, 1899356400
+            tz.transition 2030, 11, :o5, 1919916000
+            tz.transition 2031, 3, :o6, 1930806000
+            tz.transition 2031, 11, :o5, 1951365600
+            tz.transition 2032, 3, :o6, 1962860400
+            tz.transition 2032, 11, :o5, 1983420000
+            tz.transition 2033, 3, :o6, 1994310000
+            tz.transition 2033, 11, :o5, 2014869600
+            tz.transition 2034, 3, :o6, 2025759600
+            tz.transition 2034, 11, :o5, 2046319200
+            tz.transition 2035, 3, :o6, 2057209200
+            tz.transition 2035, 11, :o5, 2077768800
+            tz.transition 2036, 3, :o6, 2088658800
+            tz.transition 2036, 11, :o5, 2109218400
+            tz.transition 2037, 3, :o6, 2120108400
+            tz.transition 2037, 11, :o5, 2140668000
+            tz.transition 2038, 3, :o6, 59171923, 24
+            tz.transition 2038, 11, :o5, 9862939, 4
+            tz.transition 2039, 3, :o6, 59180659, 24
+            tz.transition 2039, 11, :o5, 9864395, 4
+            tz.transition 2040, 3, :o6, 59189395, 24
+            tz.transition 2040, 11, :o5, 9865851, 4
+            tz.transition 2041, 3, :o6, 59198131, 24
+            tz.transition 2041, 11, :o5, 9867307, 4
+            tz.transition 2042, 3, :o6, 59206867, 24
+            tz.transition 2042, 11, :o5, 9868763, 4
+            tz.transition 2043, 3, :o6, 59215603, 24
+            tz.transition 2043, 11, :o5, 9870219, 4
+            tz.transition 2044, 3, :o6, 59224507, 24
+            tz.transition 2044, 11, :o5, 9871703, 4
+            tz.transition 2045, 3, :o6, 59233243, 24
+            tz.transition 2045, 11, :o5, 9873159, 4
+            tz.transition 2046, 3, :o6, 59241979, 24
+            tz.transition 2046, 11, :o5, 9874615, 4
+            tz.transition 2047, 3, :o6, 59250715, 24
+            tz.transition 2047, 11, :o5, 9876071, 4
+            tz.transition 2048, 3, :o6, 59259451, 24
+            tz.transition 2048, 11, :o5, 9877527, 4
+            tz.transition 2049, 3, :o6, 59268355, 24
+            tz.transition 2049, 11, :o5, 9879011, 4
+            tz.transition 2050, 3, :o6, 59277091, 24
+            tz.transition 2050, 11, :o5, 9880467, 4
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Juneau.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Juneau.rb
new file mode 100644
index 00000000..f646f3f5
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Juneau.rb
@@ -0,0 +1,194 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Juneau
+        include TimezoneDefinition
+        
+        timezone 'America/Juneau' do |tz|
+          tz.offset :o0, 54139, 0, :LMT
+          tz.offset :o1, -32261, 0, :LMT
+          tz.offset :o2, -28800, 0, :PST
+          tz.offset :o3, -28800, 3600, :PWT
+          tz.offset :o4, -28800, 3600, :PPT
+          tz.offset :o5, -28800, 3600, :PDT
+          tz.offset :o6, -32400, 0, :YST
+          tz.offset :o7, -32400, 0, :AKST
+          tz.offset :o8, -32400, 3600, :AKDT
+          
+          tz.transition 1867, 10, :o1, 207641393861, 86400
+          tz.transition 1900, 8, :o2, 208677805061, 86400
+          tz.transition 1942, 2, :o3, 29164799, 12
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o2, 19453831, 8
+          tz.transition 1969, 4, :o5, 29284067, 12
+          tz.transition 1969, 10, :o2, 19524167, 8
+          tz.transition 1970, 4, :o5, 9972000
+          tz.transition 1970, 10, :o2, 25693200
+          tz.transition 1971, 4, :o5, 41421600
+          tz.transition 1971, 10, :o2, 57747600
+          tz.transition 1972, 4, :o5, 73476000
+          tz.transition 1972, 10, :o2, 89197200
+          tz.transition 1973, 4, :o5, 104925600
+          tz.transition 1973, 10, :o2, 120646800
+          tz.transition 1974, 1, :o5, 126698400
+          tz.transition 1974, 10, :o2, 152096400
+          tz.transition 1975, 2, :o5, 162381600
+          tz.transition 1975, 10, :o2, 183546000
+          tz.transition 1976, 4, :o5, 199274400
+          tz.transition 1976, 10, :o2, 215600400
+          tz.transition 1977, 4, :o5, 230724000
+          tz.transition 1977, 10, :o2, 247050000
+          tz.transition 1978, 4, :o5, 262778400
+          tz.transition 1978, 10, :o2, 278499600
+          tz.transition 1979, 4, :o5, 294228000
+          tz.transition 1979, 10, :o2, 309949200
+          tz.transition 1980, 4, :o5, 325677600
+          tz.transition 1980, 10, :o2, 341398800
+          tz.transition 1981, 4, :o5, 357127200
+          tz.transition 1981, 10, :o2, 372848400
+          tz.transition 1982, 4, :o5, 388576800
+          tz.transition 1982, 10, :o2, 404902800
+          tz.transition 1983, 4, :o5, 420026400
+          tz.transition 1983, 10, :o6, 436352400
+          tz.transition 1983, 11, :o7, 439030800
+          tz.transition 1984, 4, :o8, 452084400
+          tz.transition 1984, 10, :o7, 467805600
+          tz.transition 1985, 4, :o8, 483534000
+          tz.transition 1985, 10, :o7, 499255200
+          tz.transition 1986, 4, :o8, 514983600
+          tz.transition 1986, 10, :o7, 530704800
+          tz.transition 1987, 4, :o8, 544618800
+          tz.transition 1987, 10, :o7, 562154400
+          tz.transition 1988, 4, :o8, 576068400
+          tz.transition 1988, 10, :o7, 594208800
+          tz.transition 1989, 4, :o8, 607518000
+          tz.transition 1989, 10, :o7, 625658400
+          tz.transition 1990, 4, :o8, 638967600
+          tz.transition 1990, 10, :o7, 657108000
+          tz.transition 1991, 4, :o8, 671022000
+          tz.transition 1991, 10, :o7, 688557600
+          tz.transition 1992, 4, :o8, 702471600
+          tz.transition 1992, 10, :o7, 720007200
+          tz.transition 1993, 4, :o8, 733921200
+          tz.transition 1993, 10, :o7, 752061600
+          tz.transition 1994, 4, :o8, 765370800
+          tz.transition 1994, 10, :o7, 783511200
+          tz.transition 1995, 4, :o8, 796820400
+          tz.transition 1995, 10, :o7, 814960800
+          tz.transition 1996, 4, :o8, 828874800
+          tz.transition 1996, 10, :o7, 846410400
+          tz.transition 1997, 4, :o8, 860324400
+          tz.transition 1997, 10, :o7, 877860000
+          tz.transition 1998, 4, :o8, 891774000
+          tz.transition 1998, 10, :o7, 909309600
+          tz.transition 1999, 4, :o8, 923223600
+          tz.transition 1999, 10, :o7, 941364000
+          tz.transition 2000, 4, :o8, 954673200
+          tz.transition 2000, 10, :o7, 972813600
+          tz.transition 2001, 4, :o8, 986122800
+          tz.transition 2001, 10, :o7, 1004263200
+          tz.transition 2002, 4, :o8, 1018177200
+          tz.transition 2002, 10, :o7, 1035712800
+          tz.transition 2003, 4, :o8, 1049626800
+          tz.transition 2003, 10, :o7, 1067162400
+          tz.transition 2004, 4, :o8, 1081076400
+          tz.transition 2004, 10, :o7, 1099216800
+          tz.transition 2005, 4, :o8, 1112526000
+          tz.transition 2005, 10, :o7, 1130666400
+          tz.transition 2006, 4, :o8, 1143975600
+          tz.transition 2006, 10, :o7, 1162116000
+          tz.transition 2007, 3, :o8, 1173610800
+          tz.transition 2007, 11, :o7, 1194170400
+          tz.transition 2008, 3, :o8, 1205060400
+          tz.transition 2008, 11, :o7, 1225620000
+          tz.transition 2009, 3, :o8, 1236510000
+          tz.transition 2009, 11, :o7, 1257069600
+          tz.transition 2010, 3, :o8, 1268564400
+          tz.transition 2010, 11, :o7, 1289124000
+          tz.transition 2011, 3, :o8, 1300014000
+          tz.transition 2011, 11, :o7, 1320573600
+          tz.transition 2012, 3, :o8, 1331463600
+          tz.transition 2012, 11, :o7, 1352023200
+          tz.transition 2013, 3, :o8, 1362913200
+          tz.transition 2013, 11, :o7, 1383472800
+          tz.transition 2014, 3, :o8, 1394362800
+          tz.transition 2014, 11, :o7, 1414922400
+          tz.transition 2015, 3, :o8, 1425812400
+          tz.transition 2015, 11, :o7, 1446372000
+          tz.transition 2016, 3, :o8, 1457866800
+          tz.transition 2016, 11, :o7, 1478426400
+          tz.transition 2017, 3, :o8, 1489316400
+          tz.transition 2017, 11, :o7, 1509876000
+          tz.transition 2018, 3, :o8, 1520766000
+          tz.transition 2018, 11, :o7, 1541325600
+          tz.transition 2019, 3, :o8, 1552215600
+          tz.transition 2019, 11, :o7, 1572775200
+          tz.transition 2020, 3, :o8, 1583665200
+          tz.transition 2020, 11, :o7, 1604224800
+          tz.transition 2021, 3, :o8, 1615719600
+          tz.transition 2021, 11, :o7, 1636279200
+          tz.transition 2022, 3, :o8, 1647169200
+          tz.transition 2022, 11, :o7, 1667728800
+          tz.transition 2023, 3, :o8, 1678618800
+          tz.transition 2023, 11, :o7, 1699178400
+          tz.transition 2024, 3, :o8, 1710068400
+          tz.transition 2024, 11, :o7, 1730628000
+          tz.transition 2025, 3, :o8, 1741518000
+          tz.transition 2025, 11, :o7, 1762077600
+          tz.transition 2026, 3, :o8, 1772967600
+          tz.transition 2026, 11, :o7, 1793527200
+          tz.transition 2027, 3, :o8, 1805022000
+          tz.transition 2027, 11, :o7, 1825581600
+          tz.transition 2028, 3, :o8, 1836471600
+          tz.transition 2028, 11, :o7, 1857031200
+          tz.transition 2029, 3, :o8, 1867921200
+          tz.transition 2029, 11, :o7, 1888480800
+          tz.transition 2030, 3, :o8, 1899370800
+          tz.transition 2030, 11, :o7, 1919930400
+          tz.transition 2031, 3, :o8, 1930820400
+          tz.transition 2031, 11, :o7, 1951380000
+          tz.transition 2032, 3, :o8, 1962874800
+          tz.transition 2032, 11, :o7, 1983434400
+          tz.transition 2033, 3, :o8, 1994324400
+          tz.transition 2033, 11, :o7, 2014884000
+          tz.transition 2034, 3, :o8, 2025774000
+          tz.transition 2034, 11, :o7, 2046333600
+          tz.transition 2035, 3, :o8, 2057223600
+          tz.transition 2035, 11, :o7, 2077783200
+          tz.transition 2036, 3, :o8, 2088673200
+          tz.transition 2036, 11, :o7, 2109232800
+          tz.transition 2037, 3, :o8, 2120122800
+          tz.transition 2037, 11, :o7, 2140682400
+          tz.transition 2038, 3, :o8, 59171927, 24
+          tz.transition 2038, 11, :o7, 29588819, 12
+          tz.transition 2039, 3, :o8, 59180663, 24
+          tz.transition 2039, 11, :o7, 29593187, 12
+          tz.transition 2040, 3, :o8, 59189399, 24
+          tz.transition 2040, 11, :o7, 29597555, 12
+          tz.transition 2041, 3, :o8, 59198135, 24
+          tz.transition 2041, 11, :o7, 29601923, 12
+          tz.transition 2042, 3, :o8, 59206871, 24
+          tz.transition 2042, 11, :o7, 29606291, 12
+          tz.transition 2043, 3, :o8, 59215607, 24
+          tz.transition 2043, 11, :o7, 29610659, 12
+          tz.transition 2044, 3, :o8, 59224511, 24
+          tz.transition 2044, 11, :o7, 29615111, 12
+          tz.transition 2045, 3, :o8, 59233247, 24
+          tz.transition 2045, 11, :o7, 29619479, 12
+          tz.transition 2046, 3, :o8, 59241983, 24
+          tz.transition 2046, 11, :o7, 29623847, 12
+          tz.transition 2047, 3, :o8, 59250719, 24
+          tz.transition 2047, 11, :o7, 29628215, 12
+          tz.transition 2048, 3, :o8, 59259455, 24
+          tz.transition 2048, 11, :o7, 29632583, 12
+          tz.transition 2049, 3, :o8, 59268359, 24
+          tz.transition 2049, 11, :o7, 29637035, 12
+          tz.transition 2050, 3, :o8, 59277095, 24
+          tz.transition 2050, 11, :o7, 29641403, 12
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/La_Paz.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/La_Paz.rb
new file mode 100644
index 00000000..45c90789
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/La_Paz.rb
@@ -0,0 +1,22 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module La_Paz
+        include TimezoneDefinition
+        
+        timezone 'America/La_Paz' do |tz|
+          tz.offset :o0, -16356, 0, :LMT
+          tz.offset :o1, -16356, 0, :CMT
+          tz.offset :o2, -16356, 3600, :BOST
+          tz.offset :o3, -14400, 0, :BOT
+          
+          tz.transition 1890, 1, :o1, 17361854563, 7200
+          tz.transition 1931, 10, :o2, 17471733763, 7200
+          tz.transition 1932, 3, :o3, 17472871063, 7200
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Lima.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Lima.rb
new file mode 100644
index 00000000..af68ac29
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Lima.rb
@@ -0,0 +1,35 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Lima
+        include TimezoneDefinition
+        
+        timezone 'America/Lima' do |tz|
+          tz.offset :o0, -18492, 0, :LMT
+          tz.offset :o1, -18516, 0, :LMT
+          tz.offset :o2, -18000, 0, :PET
+          tz.offset :o3, -18000, 3600, :PEST
+          
+          tz.transition 1890, 1, :o1, 17361854741, 7200
+          tz.transition 1908, 7, :o2, 17410685143, 7200
+          tz.transition 1938, 1, :o3, 58293593, 24
+          tz.transition 1938, 4, :o2, 7286969, 3
+          tz.transition 1938, 9, :o3, 58300001, 24
+          tz.transition 1939, 3, :o2, 7288046, 3
+          tz.transition 1939, 9, :o3, 58308737, 24
+          tz.transition 1940, 3, :o2, 7289138, 3
+          tz.transition 1986, 1, :o3, 504939600
+          tz.transition 1986, 4, :o2, 512712000
+          tz.transition 1987, 1, :o3, 536475600
+          tz.transition 1987, 4, :o2, 544248000
+          tz.transition 1990, 1, :o3, 631170000
+          tz.transition 1990, 4, :o2, 638942400
+          tz.transition 1994, 1, :o3, 757400400
+          tz.transition 1994, 4, :o2, 765172800
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Los_Angeles.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Los_Angeles.rb
new file mode 100644
index 00000000..16007fd6
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Los_Angeles.rb
@@ -0,0 +1,232 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Los_Angeles
+        include TimezoneDefinition
+        
+        timezone 'America/Los_Angeles' do |tz|
+          tz.offset :o0, -28378, 0, :LMT
+          tz.offset :o1, -28800, 0, :PST
+          tz.offset :o2, -28800, 3600, :PDT
+          tz.offset :o3, -28800, 3600, :PWT
+          tz.offset :o4, -28800, 3600, :PPT
+          
+          tz.transition 1883, 11, :o1, 7227400, 3
+          tz.transition 1918, 3, :o2, 29060207, 12
+          tz.transition 1918, 10, :o1, 19375151, 8
+          tz.transition 1919, 3, :o2, 29064575, 12
+          tz.transition 1919, 10, :o1, 19378063, 8
+          tz.transition 1942, 2, :o3, 29164799, 12
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o1, 19453831, 8
+          tz.transition 1948, 3, :o2, 29191499, 12
+          tz.transition 1949, 1, :o1, 19463343, 8
+          tz.transition 1950, 4, :o2, 29200823, 12
+          tz.transition 1950, 9, :o1, 19468391, 8
+          tz.transition 1951, 4, :o2, 29205191, 12
+          tz.transition 1951, 9, :o1, 19471359, 8
+          tz.transition 1952, 4, :o2, 29209559, 12
+          tz.transition 1952, 9, :o1, 19474271, 8
+          tz.transition 1953, 4, :o2, 29213927, 12
+          tz.transition 1953, 9, :o1, 19477183, 8
+          tz.transition 1954, 4, :o2, 29218295, 12
+          tz.transition 1954, 9, :o1, 19480095, 8
+          tz.transition 1955, 4, :o2, 29222663, 12
+          tz.transition 1955, 9, :o1, 19483007, 8
+          tz.transition 1956, 4, :o2, 29227115, 12
+          tz.transition 1956, 9, :o1, 19485975, 8
+          tz.transition 1957, 4, :o2, 29231483, 12
+          tz.transition 1957, 9, :o1, 19488887, 8
+          tz.transition 1958, 4, :o2, 29235851, 12
+          tz.transition 1958, 9, :o1, 19491799, 8
+          tz.transition 1959, 4, :o2, 29240219, 12
+          tz.transition 1959, 9, :o1, 19494711, 8
+          tz.transition 1960, 4, :o2, 29244587, 12
+          tz.transition 1960, 9, :o1, 19497623, 8
+          tz.transition 1961, 4, :o2, 29249039, 12
+          tz.transition 1961, 9, :o1, 19500535, 8
+          tz.transition 1962, 4, :o2, 29253407, 12
+          tz.transition 1962, 10, :o1, 19503727, 8
+          tz.transition 1963, 4, :o2, 29257775, 12
+          tz.transition 1963, 10, :o1, 19506639, 8
+          tz.transition 1964, 4, :o2, 29262143, 12
+          tz.transition 1964, 10, :o1, 19509551, 8
+          tz.transition 1965, 4, :o2, 29266511, 12
+          tz.transition 1965, 10, :o1, 19512519, 8
+          tz.transition 1966, 4, :o2, 29270879, 12
+          tz.transition 1966, 10, :o1, 19515431, 8
+          tz.transition 1967, 4, :o2, 29275331, 12
+          tz.transition 1967, 10, :o1, 19518343, 8
+          tz.transition 1968, 4, :o2, 29279699, 12
+          tz.transition 1968, 10, :o1, 19521255, 8
+          tz.transition 1969, 4, :o2, 29284067, 12
+          tz.transition 1969, 10, :o1, 19524167, 8
+          tz.transition 1970, 4, :o2, 9972000
+          tz.transition 1970, 10, :o1, 25693200
+          tz.transition 1971, 4, :o2, 41421600
+          tz.transition 1971, 10, :o1, 57747600
+          tz.transition 1972, 4, :o2, 73476000
+          tz.transition 1972, 10, :o1, 89197200
+          tz.transition 1973, 4, :o2, 104925600
+          tz.transition 1973, 10, :o1, 120646800
+          tz.transition 1974, 1, :o2, 126698400
+          tz.transition 1974, 10, :o1, 152096400
+          tz.transition 1975, 2, :o2, 162381600
+          tz.transition 1975, 10, :o1, 183546000
+          tz.transition 1976, 4, :o2, 199274400
+          tz.transition 1976, 10, :o1, 215600400
+          tz.transition 1977, 4, :o2, 230724000
+          tz.transition 1977, 10, :o1, 247050000
+          tz.transition 1978, 4, :o2, 262778400
+          tz.transition 1978, 10, :o1, 278499600
+          tz.transition 1979, 4, :o2, 294228000
+          tz.transition 1979, 10, :o1, 309949200
+          tz.transition 1980, 4, :o2, 325677600
+          tz.transition 1980, 10, :o1, 341398800
+          tz.transition 1981, 4, :o2, 357127200
+          tz.transition 1981, 10, :o1, 372848400
+          tz.transition 1982, 4, :o2, 388576800
+          tz.transition 1982, 10, :o1, 404902800
+          tz.transition 1983, 4, :o2, 420026400
+          tz.transition 1983, 10, :o1, 436352400
+          tz.transition 1984, 4, :o2, 452080800
+          tz.transition 1984, 10, :o1, 467802000
+          tz.transition 1985, 4, :o2, 483530400
+          tz.transition 1985, 10, :o1, 499251600
+          tz.transition 1986, 4, :o2, 514980000
+          tz.transition 1986, 10, :o1, 530701200
+          tz.transition 1987, 4, :o2, 544615200
+          tz.transition 1987, 10, :o1, 562150800
+          tz.transition 1988, 4, :o2, 576064800
+          tz.transition 1988, 10, :o1, 594205200
+          tz.transition 1989, 4, :o2, 607514400
+          tz.transition 1989, 10, :o1, 625654800
+          tz.transition 1990, 4, :o2, 638964000
+          tz.transition 1990, 10, :o1, 657104400
+          tz.transition 1991, 4, :o2, 671018400
+          tz.transition 1991, 10, :o1, 688554000
+          tz.transition 1992, 4, :o2, 702468000
+          tz.transition 1992, 10, :o1, 720003600
+          tz.transition 1993, 4, :o2, 733917600
+          tz.transition 1993, 10, :o1, 752058000
+          tz.transition 1994, 4, :o2, 765367200
+          tz.transition 1994, 10, :o1, 783507600
+          tz.transition 1995, 4, :o2, 796816800
+          tz.transition 1995, 10, :o1, 814957200
+          tz.transition 1996, 4, :o2, 828871200
+          tz.transition 1996, 10, :o1, 846406800
+          tz.transition 1997, 4, :o2, 860320800
+          tz.transition 1997, 10, :o1, 877856400
+          tz.transition 1998, 4, :o2, 891770400
+          tz.transition 1998, 10, :o1, 909306000
+          tz.transition 1999, 4, :o2, 923220000
+          tz.transition 1999, 10, :o1, 941360400
+          tz.transition 2000, 4, :o2, 954669600
+          tz.transition 2000, 10, :o1, 972810000
+          tz.transition 2001, 4, :o2, 986119200
+          tz.transition 2001, 10, :o1, 1004259600
+          tz.transition 2002, 4, :o2, 1018173600
+          tz.transition 2002, 10, :o1, 1035709200
+          tz.transition 2003, 4, :o2, 1049623200
+          tz.transition 2003, 10, :o1, 1067158800
+          tz.transition 2004, 4, :o2, 1081072800
+          tz.transition 2004, 10, :o1, 1099213200
+          tz.transition 2005, 4, :o2, 1112522400
+          tz.transition 2005, 10, :o1, 1130662800
+          tz.transition 2006, 4, :o2, 1143972000
+          tz.transition 2006, 10, :o1, 1162112400
+          tz.transition 2007, 3, :o2, 1173607200
+          tz.transition 2007, 11, :o1, 1194166800
+          tz.transition 2008, 3, :o2, 1205056800
+          tz.transition 2008, 11, :o1, 1225616400
+          tz.transition 2009, 3, :o2, 1236506400
+          tz.transition 2009, 11, :o1, 1257066000
+          tz.transition 2010, 3, :o2, 1268560800
+          tz.transition 2010, 11, :o1, 1289120400
+          tz.transition 2011, 3, :o2, 1300010400
+          tz.transition 2011, 11, :o1, 1320570000
+          tz.transition 2012, 3, :o2, 1331460000
+          tz.transition 2012, 11, :o1, 1352019600
+          tz.transition 2013, 3, :o2, 1362909600
+          tz.transition 2013, 11, :o1, 1383469200
+          tz.transition 2014, 3, :o2, 1394359200
+          tz.transition 2014, 11, :o1, 1414918800
+          tz.transition 2015, 3, :o2, 1425808800
+          tz.transition 2015, 11, :o1, 1446368400
+          tz.transition 2016, 3, :o2, 1457863200
+          tz.transition 2016, 11, :o1, 1478422800
+          tz.transition 2017, 3, :o2, 1489312800
+          tz.transition 2017, 11, :o1, 1509872400
+          tz.transition 2018, 3, :o2, 1520762400
+          tz.transition 2018, 11, :o1, 1541322000
+          tz.transition 2019, 3, :o2, 1552212000
+          tz.transition 2019, 11, :o1, 1572771600
+          tz.transition 2020, 3, :o2, 1583661600
+          tz.transition 2020, 11, :o1, 1604221200
+          tz.transition 2021, 3, :o2, 1615716000
+          tz.transition 2021, 11, :o1, 1636275600
+          tz.transition 2022, 3, :o2, 1647165600
+          tz.transition 2022, 11, :o1, 1667725200
+          tz.transition 2023, 3, :o2, 1678615200
+          tz.transition 2023, 11, :o1, 1699174800
+          tz.transition 2024, 3, :o2, 1710064800
+          tz.transition 2024, 11, :o1, 1730624400
+          tz.transition 2025, 3, :o2, 1741514400
+          tz.transition 2025, 11, :o1, 1762074000
+          tz.transition 2026, 3, :o2, 1772964000
+          tz.transition 2026, 11, :o1, 1793523600
+          tz.transition 2027, 3, :o2, 1805018400
+          tz.transition 2027, 11, :o1, 1825578000
+          tz.transition 2028, 3, :o2, 1836468000
+          tz.transition 2028, 11, :o1, 1857027600
+          tz.transition 2029, 3, :o2, 1867917600
+          tz.transition 2029, 11, :o1, 1888477200
+          tz.transition 2030, 3, :o2, 1899367200
+          tz.transition 2030, 11, :o1, 1919926800
+          tz.transition 2031, 3, :o2, 1930816800
+          tz.transition 2031, 11, :o1, 1951376400
+          tz.transition 2032, 3, :o2, 1962871200
+          tz.transition 2032, 11, :o1, 1983430800
+          tz.transition 2033, 3, :o2, 1994320800
+          tz.transition 2033, 11, :o1, 2014880400
+          tz.transition 2034, 3, :o2, 2025770400
+          tz.transition 2034, 11, :o1, 2046330000
+          tz.transition 2035, 3, :o2, 2057220000
+          tz.transition 2035, 11, :o1, 2077779600
+          tz.transition 2036, 3, :o2, 2088669600
+          tz.transition 2036, 11, :o1, 2109229200
+          tz.transition 2037, 3, :o2, 2120119200
+          tz.transition 2037, 11, :o1, 2140678800
+          tz.transition 2038, 3, :o2, 29585963, 12
+          tz.transition 2038, 11, :o1, 19725879, 8
+          tz.transition 2039, 3, :o2, 29590331, 12
+          tz.transition 2039, 11, :o1, 19728791, 8
+          tz.transition 2040, 3, :o2, 29594699, 12
+          tz.transition 2040, 11, :o1, 19731703, 8
+          tz.transition 2041, 3, :o2, 29599067, 12
+          tz.transition 2041, 11, :o1, 19734615, 8
+          tz.transition 2042, 3, :o2, 29603435, 12
+          tz.transition 2042, 11, :o1, 19737527, 8
+          tz.transition 2043, 3, :o2, 29607803, 12
+          tz.transition 2043, 11, :o1, 19740439, 8
+          tz.transition 2044, 3, :o2, 29612255, 12
+          tz.transition 2044, 11, :o1, 19743407, 8
+          tz.transition 2045, 3, :o2, 29616623, 12
+          tz.transition 2045, 11, :o1, 19746319, 8
+          tz.transition 2046, 3, :o2, 29620991, 12
+          tz.transition 2046, 11, :o1, 19749231, 8
+          tz.transition 2047, 3, :o2, 29625359, 12
+          tz.transition 2047, 11, :o1, 19752143, 8
+          tz.transition 2048, 3, :o2, 29629727, 12
+          tz.transition 2048, 11, :o1, 19755055, 8
+          tz.transition 2049, 3, :o2, 29634179, 12
+          tz.transition 2049, 11, :o1, 19758023, 8
+          tz.transition 2050, 3, :o2, 29638547, 12
+          tz.transition 2050, 11, :o1, 19760935, 8
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mazatlan.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mazatlan.rb
new file mode 100644
index 00000000..ba9e6efc
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mazatlan.rb
@@ -0,0 +1,139 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Mazatlan
+        include TimezoneDefinition
+        
+        timezone 'America/Mazatlan' do |tz|
+          tz.offset :o0, -25540, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -21600, 0, :CST
+          tz.offset :o3, -28800, 0, :PST
+          tz.offset :o4, -25200, 3600, :MDT
+          
+          tz.transition 1922, 1, :o1, 58153339, 24
+          tz.transition 1927, 6, :o2, 9700171, 4
+          tz.transition 1930, 11, :o1, 9705183, 4
+          tz.transition 1931, 5, :o2, 9705855, 4
+          tz.transition 1931, 10, :o1, 9706463, 4
+          tz.transition 1932, 4, :o2, 58243171, 24
+          tz.transition 1942, 4, :o1, 9721895, 4
+          tz.transition 1949, 1, :o3, 58390339, 24
+          tz.transition 1970, 1, :o1, 28800
+          tz.transition 1996, 4, :o4, 828867600
+          tz.transition 1996, 10, :o1, 846403200
+          tz.transition 1997, 4, :o4, 860317200
+          tz.transition 1997, 10, :o1, 877852800
+          tz.transition 1998, 4, :o4, 891766800
+          tz.transition 1998, 10, :o1, 909302400
+          tz.transition 1999, 4, :o4, 923216400
+          tz.transition 1999, 10, :o1, 941356800
+          tz.transition 2000, 4, :o4, 954666000
+          tz.transition 2000, 10, :o1, 972806400
+          tz.transition 2001, 5, :o4, 989139600
+          tz.transition 2001, 9, :o1, 1001836800
+          tz.transition 2002, 4, :o4, 1018170000
+          tz.transition 2002, 10, :o1, 1035705600
+          tz.transition 2003, 4, :o4, 1049619600
+          tz.transition 2003, 10, :o1, 1067155200
+          tz.transition 2004, 4, :o4, 1081069200
+          tz.transition 2004, 10, :o1, 1099209600
+          tz.transition 2005, 4, :o4, 1112518800
+          tz.transition 2005, 10, :o1, 1130659200
+          tz.transition 2006, 4, :o4, 1143968400
+          tz.transition 2006, 10, :o1, 1162108800
+          tz.transition 2007, 4, :o4, 1175418000
+          tz.transition 2007, 10, :o1, 1193558400
+          tz.transition 2008, 4, :o4, 1207472400
+          tz.transition 2008, 10, :o1, 1225008000
+          tz.transition 2009, 4, :o4, 1238922000
+          tz.transition 2009, 10, :o1, 1256457600
+          tz.transition 2010, 4, :o4, 1270371600
+          tz.transition 2010, 10, :o1, 1288512000
+          tz.transition 2011, 4, :o4, 1301821200
+          tz.transition 2011, 10, :o1, 1319961600
+          tz.transition 2012, 4, :o4, 1333270800
+          tz.transition 2012, 10, :o1, 1351411200
+          tz.transition 2013, 4, :o4, 1365325200
+          tz.transition 2013, 10, :o1, 1382860800
+          tz.transition 2014, 4, :o4, 1396774800
+          tz.transition 2014, 10, :o1, 1414310400
+          tz.transition 2015, 4, :o4, 1428224400
+          tz.transition 2015, 10, :o1, 1445760000
+          tz.transition 2016, 4, :o4, 1459674000
+          tz.transition 2016, 10, :o1, 1477814400
+          tz.transition 2017, 4, :o4, 1491123600
+          tz.transition 2017, 10, :o1, 1509264000
+          tz.transition 2018, 4, :o4, 1522573200
+          tz.transition 2018, 10, :o1, 1540713600
+          tz.transition 2019, 4, :o4, 1554627600
+          tz.transition 2019, 10, :o1, 1572163200
+          tz.transition 2020, 4, :o4, 1586077200
+          tz.transition 2020, 10, :o1, 1603612800
+          tz.transition 2021, 4, :o4, 1617526800
+          tz.transition 2021, 10, :o1, 1635667200
+          tz.transition 2022, 4, :o4, 1648976400
+          tz.transition 2022, 10, :o1, 1667116800
+          tz.transition 2023, 4, :o4, 1680426000
+          tz.transition 2023, 10, :o1, 1698566400
+          tz.transition 2024, 4, :o4, 1712480400
+          tz.transition 2024, 10, :o1, 1730016000
+          tz.transition 2025, 4, :o4, 1743930000
+          tz.transition 2025, 10, :o1, 1761465600
+          tz.transition 2026, 4, :o4, 1775379600
+          tz.transition 2026, 10, :o1, 1792915200
+          tz.transition 2027, 4, :o4, 1806829200
+          tz.transition 2027, 10, :o1, 1824969600
+          tz.transition 2028, 4, :o4, 1838278800
+          tz.transition 2028, 10, :o1, 1856419200
+          tz.transition 2029, 4, :o4, 1869728400
+          tz.transition 2029, 10, :o1, 1887868800
+          tz.transition 2030, 4, :o4, 1901782800
+          tz.transition 2030, 10, :o1, 1919318400
+          tz.transition 2031, 4, :o4, 1933232400
+          tz.transition 2031, 10, :o1, 1950768000
+          tz.transition 2032, 4, :o4, 1964682000
+          tz.transition 2032, 10, :o1, 1982822400
+          tz.transition 2033, 4, :o4, 1996131600
+          tz.transition 2033, 10, :o1, 2014272000
+          tz.transition 2034, 4, :o4, 2027581200
+          tz.transition 2034, 10, :o1, 2045721600
+          tz.transition 2035, 4, :o4, 2059030800
+          tz.transition 2035, 10, :o1, 2077171200
+          tz.transition 2036, 4, :o4, 2091085200
+          tz.transition 2036, 10, :o1, 2108620800
+          tz.transition 2037, 4, :o4, 2122534800
+          tz.transition 2037, 10, :o1, 2140070400
+          tz.transition 2038, 4, :o4, 19724143, 8
+          tz.transition 2038, 10, :o1, 14794367, 6
+          tz.transition 2039, 4, :o4, 19727055, 8
+          tz.transition 2039, 10, :o1, 14796551, 6
+          tz.transition 2040, 4, :o4, 19729967, 8
+          tz.transition 2040, 10, :o1, 14798735, 6
+          tz.transition 2041, 4, :o4, 19732935, 8
+          tz.transition 2041, 10, :o1, 14800919, 6
+          tz.transition 2042, 4, :o4, 19735847, 8
+          tz.transition 2042, 10, :o1, 14803103, 6
+          tz.transition 2043, 4, :o4, 19738759, 8
+          tz.transition 2043, 10, :o1, 14805287, 6
+          tz.transition 2044, 4, :o4, 19741671, 8
+          tz.transition 2044, 10, :o1, 14807513, 6
+          tz.transition 2045, 4, :o4, 19744583, 8
+          tz.transition 2045, 10, :o1, 14809697, 6
+          tz.transition 2046, 4, :o4, 19747495, 8
+          tz.transition 2046, 10, :o1, 14811881, 6
+          tz.transition 2047, 4, :o4, 19750463, 8
+          tz.transition 2047, 10, :o1, 14814065, 6
+          tz.transition 2048, 4, :o4, 19753375, 8
+          tz.transition 2048, 10, :o1, 14816249, 6
+          tz.transition 2049, 4, :o4, 19756287, 8
+          tz.transition 2049, 10, :o1, 14818475, 6
+          tz.transition 2050, 4, :o4, 19759199, 8
+          tz.transition 2050, 10, :o1, 14820659, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mexico_City.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mexico_City.rb
new file mode 100644
index 00000000..2347fce6
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mexico_City.rb
@@ -0,0 +1,144 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Mexico_City
+        include TimezoneDefinition
+        
+        timezone 'America/Mexico_City' do |tz|
+          tz.offset :o0, -23796, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -21600, 0, :CST
+          tz.offset :o3, -21600, 3600, :CDT
+          tz.offset :o4, -21600, 3600, :CWT
+          
+          tz.transition 1922, 1, :o1, 58153339, 24
+          tz.transition 1927, 6, :o2, 9700171, 4
+          tz.transition 1930, 11, :o1, 9705183, 4
+          tz.transition 1931, 5, :o2, 9705855, 4
+          tz.transition 1931, 10, :o1, 9706463, 4
+          tz.transition 1932, 4, :o2, 58243171, 24
+          tz.transition 1939, 2, :o3, 9717199, 4
+          tz.transition 1939, 6, :o2, 58306553, 24
+          tz.transition 1940, 12, :o3, 9719891, 4
+          tz.transition 1941, 4, :o2, 58322057, 24
+          tz.transition 1943, 12, :o4, 9724299, 4
+          tz.transition 1944, 5, :o2, 58349081, 24
+          tz.transition 1950, 2, :o3, 9733299, 4
+          tz.transition 1950, 7, :o2, 58403825, 24
+          tz.transition 1996, 4, :o3, 828864000
+          tz.transition 1996, 10, :o2, 846399600
+          tz.transition 1997, 4, :o3, 860313600
+          tz.transition 1997, 10, :o2, 877849200
+          tz.transition 1998, 4, :o3, 891763200
+          tz.transition 1998, 10, :o2, 909298800
+          tz.transition 1999, 4, :o3, 923212800
+          tz.transition 1999, 10, :o2, 941353200
+          tz.transition 2000, 4, :o3, 954662400
+          tz.transition 2000, 10, :o2, 972802800
+          tz.transition 2001, 5, :o3, 989136000
+          tz.transition 2001, 9, :o2, 1001833200
+          tz.transition 2002, 4, :o3, 1018166400
+          tz.transition 2002, 10, :o2, 1035702000
+          tz.transition 2003, 4, :o3, 1049616000
+          tz.transition 2003, 10, :o2, 1067151600
+          tz.transition 2004, 4, :o3, 1081065600
+          tz.transition 2004, 10, :o2, 1099206000
+          tz.transition 2005, 4, :o3, 1112515200
+          tz.transition 2005, 10, :o2, 1130655600
+          tz.transition 2006, 4, :o3, 1143964800
+          tz.transition 2006, 10, :o2, 1162105200
+          tz.transition 2007, 4, :o3, 1175414400
+          tz.transition 2007, 10, :o2, 1193554800
+          tz.transition 2008, 4, :o3, 1207468800
+          tz.transition 2008, 10, :o2, 1225004400
+          tz.transition 2009, 4, :o3, 1238918400
+          tz.transition 2009, 10, :o2, 1256454000
+          tz.transition 2010, 4, :o3, 1270368000
+          tz.transition 2010, 10, :o2, 1288508400
+          tz.transition 2011, 4, :o3, 1301817600
+          tz.transition 2011, 10, :o2, 1319958000
+          tz.transition 2012, 4, :o3, 1333267200
+          tz.transition 2012, 10, :o2, 1351407600
+          tz.transition 2013, 4, :o3, 1365321600
+          tz.transition 2013, 10, :o2, 1382857200
+          tz.transition 2014, 4, :o3, 1396771200
+          tz.transition 2014, 10, :o2, 1414306800
+          tz.transition 2015, 4, :o3, 1428220800
+          tz.transition 2015, 10, :o2, 1445756400
+          tz.transition 2016, 4, :o3, 1459670400
+          tz.transition 2016, 10, :o2, 1477810800
+          tz.transition 2017, 4, :o3, 1491120000
+          tz.transition 2017, 10, :o2, 1509260400
+          tz.transition 2018, 4, :o3, 1522569600
+          tz.transition 2018, 10, :o2, 1540710000
+          tz.transition 2019, 4, :o3, 1554624000
+          tz.transition 2019, 10, :o2, 1572159600
+          tz.transition 2020, 4, :o3, 1586073600
+          tz.transition 2020, 10, :o2, 1603609200
+          tz.transition 2021, 4, :o3, 1617523200
+          tz.transition 2021, 10, :o2, 1635663600
+          tz.transition 2022, 4, :o3, 1648972800
+          tz.transition 2022, 10, :o2, 1667113200
+          tz.transition 2023, 4, :o3, 1680422400
+          tz.transition 2023, 10, :o2, 1698562800
+          tz.transition 2024, 4, :o3, 1712476800
+          tz.transition 2024, 10, :o2, 1730012400
+          tz.transition 2025, 4, :o3, 1743926400
+          tz.transition 2025, 10, :o2, 1761462000
+          tz.transition 2026, 4, :o3, 1775376000
+          tz.transition 2026, 10, :o2, 1792911600
+          tz.transition 2027, 4, :o3, 1806825600
+          tz.transition 2027, 10, :o2, 1824966000
+          tz.transition 2028, 4, :o3, 1838275200
+          tz.transition 2028, 10, :o2, 1856415600
+          tz.transition 2029, 4, :o3, 1869724800
+          tz.transition 2029, 10, :o2, 1887865200
+          tz.transition 2030, 4, :o3, 1901779200
+          tz.transition 2030, 10, :o2, 1919314800
+          tz.transition 2031, 4, :o3, 1933228800
+          tz.transition 2031, 10, :o2, 1950764400
+          tz.transition 2032, 4, :o3, 1964678400
+          tz.transition 2032, 10, :o2, 1982818800
+          tz.transition 2033, 4, :o3, 1996128000
+          tz.transition 2033, 10, :o2, 2014268400
+          tz.transition 2034, 4, :o3, 2027577600
+          tz.transition 2034, 10, :o2, 2045718000
+          tz.transition 2035, 4, :o3, 2059027200
+          tz.transition 2035, 10, :o2, 2077167600
+          tz.transition 2036, 4, :o3, 2091081600
+          tz.transition 2036, 10, :o2, 2108617200
+          tz.transition 2037, 4, :o3, 2122531200
+          tz.transition 2037, 10, :o2, 2140066800
+          tz.transition 2038, 4, :o3, 14793107, 6
+          tz.transition 2038, 10, :o2, 59177467, 24
+          tz.transition 2039, 4, :o3, 14795291, 6
+          tz.transition 2039, 10, :o2, 59186203, 24
+          tz.transition 2040, 4, :o3, 14797475, 6
+          tz.transition 2040, 10, :o2, 59194939, 24
+          tz.transition 2041, 4, :o3, 14799701, 6
+          tz.transition 2041, 10, :o2, 59203675, 24
+          tz.transition 2042, 4, :o3, 14801885, 6
+          tz.transition 2042, 10, :o2, 59212411, 24
+          tz.transition 2043, 4, :o3, 14804069, 6
+          tz.transition 2043, 10, :o2, 59221147, 24
+          tz.transition 2044, 4, :o3, 14806253, 6
+          tz.transition 2044, 10, :o2, 59230051, 24
+          tz.transition 2045, 4, :o3, 14808437, 6
+          tz.transition 2045, 10, :o2, 59238787, 24
+          tz.transition 2046, 4, :o3, 14810621, 6
+          tz.transition 2046, 10, :o2, 59247523, 24
+          tz.transition 2047, 4, :o3, 14812847, 6
+          tz.transition 2047, 10, :o2, 59256259, 24
+          tz.transition 2048, 4, :o3, 14815031, 6
+          tz.transition 2048, 10, :o2, 59264995, 24
+          tz.transition 2049, 4, :o3, 14817215, 6
+          tz.transition 2049, 10, :o2, 59273899, 24
+          tz.transition 2050, 4, :o3, 14819399, 6
+          tz.transition 2050, 10, :o2, 59282635, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Monterrey.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Monterrey.rb
new file mode 100644
index 00000000..5816a9ea
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Monterrey.rb
@@ -0,0 +1,131 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Monterrey
+        include TimezoneDefinition
+        
+        timezone 'America/Monterrey' do |tz|
+          tz.offset :o0, -24076, 0, :LMT
+          tz.offset :o1, -21600, 0, :CST
+          tz.offset :o2, -21600, 3600, :CDT
+          
+          tz.transition 1922, 1, :o1, 9692223, 4
+          tz.transition 1988, 4, :o2, 576057600
+          tz.transition 1988, 10, :o1, 594198000
+          tz.transition 1996, 4, :o2, 828864000
+          tz.transition 1996, 10, :o1, 846399600
+          tz.transition 1997, 4, :o2, 860313600
+          tz.transition 1997, 10, :o1, 877849200
+          tz.transition 1998, 4, :o2, 891763200
+          tz.transition 1998, 10, :o1, 909298800
+          tz.transition 1999, 4, :o2, 923212800
+          tz.transition 1999, 10, :o1, 941353200
+          tz.transition 2000, 4, :o2, 954662400
+          tz.transition 2000, 10, :o1, 972802800
+          tz.transition 2001, 5, :o2, 989136000
+          tz.transition 2001, 9, :o1, 1001833200
+          tz.transition 2002, 4, :o2, 1018166400
+          tz.transition 2002, 10, :o1, 1035702000
+          tz.transition 2003, 4, :o2, 1049616000
+          tz.transition 2003, 10, :o1, 1067151600
+          tz.transition 2004, 4, :o2, 1081065600
+          tz.transition 2004, 10, :o1, 1099206000
+          tz.transition 2005, 4, :o2, 1112515200
+          tz.transition 2005, 10, :o1, 1130655600
+          tz.transition 2006, 4, :o2, 1143964800
+          tz.transition 2006, 10, :o1, 1162105200
+          tz.transition 2007, 4, :o2, 1175414400
+          tz.transition 2007, 10, :o1, 1193554800
+          tz.transition 2008, 4, :o2, 1207468800
+          tz.transition 2008, 10, :o1, 1225004400
+          tz.transition 2009, 4, :o2, 1238918400
+          tz.transition 2009, 10, :o1, 1256454000
+          tz.transition 2010, 4, :o2, 1270368000
+          tz.transition 2010, 10, :o1, 1288508400
+          tz.transition 2011, 4, :o2, 1301817600
+          tz.transition 2011, 10, :o1, 1319958000
+          tz.transition 2012, 4, :o2, 1333267200
+          tz.transition 2012, 10, :o1, 1351407600
+          tz.transition 2013, 4, :o2, 1365321600
+          tz.transition 2013, 10, :o1, 1382857200
+          tz.transition 2014, 4, :o2, 1396771200
+          tz.transition 2014, 10, :o1, 1414306800
+          tz.transition 2015, 4, :o2, 1428220800
+          tz.transition 2015, 10, :o1, 1445756400
+          tz.transition 2016, 4, :o2, 1459670400
+          tz.transition 2016, 10, :o1, 1477810800
+          tz.transition 2017, 4, :o2, 1491120000
+          tz.transition 2017, 10, :o1, 1509260400
+          tz.transition 2018, 4, :o2, 1522569600
+          tz.transition 2018, 10, :o1, 1540710000
+          tz.transition 2019, 4, :o2, 1554624000
+          tz.transition 2019, 10, :o1, 1572159600
+          tz.transition 2020, 4, :o2, 1586073600
+          tz.transition 2020, 10, :o1, 1603609200
+          tz.transition 2021, 4, :o2, 1617523200
+          tz.transition 2021, 10, :o1, 1635663600
+          tz.transition 2022, 4, :o2, 1648972800
+          tz.transition 2022, 10, :o1, 1667113200
+          tz.transition 2023, 4, :o2, 1680422400
+          tz.transition 2023, 10, :o1, 1698562800
+          tz.transition 2024, 4, :o2, 1712476800
+          tz.transition 2024, 10, :o1, 1730012400
+          tz.transition 2025, 4, :o2, 1743926400
+          tz.transition 2025, 10, :o1, 1761462000
+          tz.transition 2026, 4, :o2, 1775376000
+          tz.transition 2026, 10, :o1, 1792911600
+          tz.transition 2027, 4, :o2, 1806825600
+          tz.transition 2027, 10, :o1, 1824966000
+          tz.transition 2028, 4, :o2, 1838275200
+          tz.transition 2028, 10, :o1, 1856415600
+          tz.transition 2029, 4, :o2, 1869724800
+          tz.transition 2029, 10, :o1, 1887865200
+          tz.transition 2030, 4, :o2, 1901779200
+          tz.transition 2030, 10, :o1, 1919314800
+          tz.transition 2031, 4, :o2, 1933228800
+          tz.transition 2031, 10, :o1, 1950764400
+          tz.transition 2032, 4, :o2, 1964678400
+          tz.transition 2032, 10, :o1, 1982818800
+          tz.transition 2033, 4, :o2, 1996128000
+          tz.transition 2033, 10, :o1, 2014268400
+          tz.transition 2034, 4, :o2, 2027577600
+          tz.transition 2034, 10, :o1, 2045718000
+          tz.transition 2035, 4, :o2, 2059027200
+          tz.transition 2035, 10, :o1, 2077167600
+          tz.transition 2036, 4, :o2, 2091081600
+          tz.transition 2036, 10, :o1, 2108617200
+          tz.transition 2037, 4, :o2, 2122531200
+          tz.transition 2037, 10, :o1, 2140066800
+          tz.transition 2038, 4, :o2, 14793107, 6
+          tz.transition 2038, 10, :o1, 59177467, 24
+          tz.transition 2039, 4, :o2, 14795291, 6
+          tz.transition 2039, 10, :o1, 59186203, 24
+          tz.transition 2040, 4, :o2, 14797475, 6
+          tz.transition 2040, 10, :o1, 59194939, 24
+          tz.transition 2041, 4, :o2, 14799701, 6
+          tz.transition 2041, 10, :o1, 59203675, 24
+          tz.transition 2042, 4, :o2, 14801885, 6
+          tz.transition 2042, 10, :o1, 59212411, 24
+          tz.transition 2043, 4, :o2, 14804069, 6
+          tz.transition 2043, 10, :o1, 59221147, 24
+          tz.transition 2044, 4, :o2, 14806253, 6
+          tz.transition 2044, 10, :o1, 59230051, 24
+          tz.transition 2045, 4, :o2, 14808437, 6
+          tz.transition 2045, 10, :o1, 59238787, 24
+          tz.transition 2046, 4, :o2, 14810621, 6
+          tz.transition 2046, 10, :o1, 59247523, 24
+          tz.transition 2047, 4, :o2, 14812847, 6
+          tz.transition 2047, 10, :o1, 59256259, 24
+          tz.transition 2048, 4, :o2, 14815031, 6
+          tz.transition 2048, 10, :o1, 59264995, 24
+          tz.transition 2049, 4, :o2, 14817215, 6
+          tz.transition 2049, 10, :o1, 59273899, 24
+          tz.transition 2050, 4, :o2, 14819399, 6
+          tz.transition 2050, 10, :o1, 59282635, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/New_York.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/New_York.rb
new file mode 100644
index 00000000..7d802bd2
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/New_York.rb
@@ -0,0 +1,282 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module New_York
+        include TimezoneDefinition
+        
+        timezone 'America/New_York' do |tz|
+          tz.offset :o0, -17762, 0, :LMT
+          tz.offset :o1, -18000, 0, :EST
+          tz.offset :o2, -18000, 3600, :EDT
+          tz.offset :o3, -18000, 3600, :EWT
+          tz.offset :o4, -18000, 3600, :EPT
+          
+          tz.transition 1883, 11, :o1, 57819197, 24
+          tz.transition 1918, 3, :o2, 58120411, 24
+          tz.transition 1918, 10, :o1, 9687575, 4
+          tz.transition 1919, 3, :o2, 58129147, 24
+          tz.transition 1919, 10, :o1, 9689031, 4
+          tz.transition 1920, 3, :o2, 58137883, 24
+          tz.transition 1920, 10, :o1, 9690515, 4
+          tz.transition 1921, 4, :o2, 58147291, 24
+          tz.transition 1921, 9, :o1, 9691831, 4
+          tz.transition 1922, 4, :o2, 58156195, 24
+          tz.transition 1922, 9, :o1, 9693287, 4
+          tz.transition 1923, 4, :o2, 58164931, 24
+          tz.transition 1923, 9, :o1, 9694771, 4
+          tz.transition 1924, 4, :o2, 58173667, 24
+          tz.transition 1924, 9, :o1, 9696227, 4
+          tz.transition 1925, 4, :o2, 58182403, 24
+          tz.transition 1925, 9, :o1, 9697683, 4
+          tz.transition 1926, 4, :o2, 58191139, 24
+          tz.transition 1926, 9, :o1, 9699139, 4
+          tz.transition 1927, 4, :o2, 58199875, 24
+          tz.transition 1927, 9, :o1, 9700595, 4
+          tz.transition 1928, 4, :o2, 58208779, 24
+          tz.transition 1928, 9, :o1, 9702079, 4
+          tz.transition 1929, 4, :o2, 58217515, 24
+          tz.transition 1929, 9, :o1, 9703535, 4
+          tz.transition 1930, 4, :o2, 58226251, 24
+          tz.transition 1930, 9, :o1, 9704991, 4
+          tz.transition 1931, 4, :o2, 58234987, 24
+          tz.transition 1931, 9, :o1, 9706447, 4
+          tz.transition 1932, 4, :o2, 58243723, 24
+          tz.transition 1932, 9, :o1, 9707903, 4
+          tz.transition 1933, 4, :o2, 58252627, 24
+          tz.transition 1933, 9, :o1, 9709359, 4
+          tz.transition 1934, 4, :o2, 58261363, 24
+          tz.transition 1934, 9, :o1, 9710843, 4
+          tz.transition 1935, 4, :o2, 58270099, 24
+          tz.transition 1935, 9, :o1, 9712299, 4
+          tz.transition 1936, 4, :o2, 58278835, 24
+          tz.transition 1936, 9, :o1, 9713755, 4
+          tz.transition 1937, 4, :o2, 58287571, 24
+          tz.transition 1937, 9, :o1, 9715211, 4
+          tz.transition 1938, 4, :o2, 58296307, 24
+          tz.transition 1938, 9, :o1, 9716667, 4
+          tz.transition 1939, 4, :o2, 58305211, 24
+          tz.transition 1939, 9, :o1, 9718123, 4
+          tz.transition 1940, 4, :o2, 58313947, 24
+          tz.transition 1940, 9, :o1, 9719607, 4
+          tz.transition 1941, 4, :o2, 58322683, 24
+          tz.transition 1941, 9, :o1, 9721063, 4
+          tz.transition 1942, 2, :o3, 58329595, 24
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o1, 9726915, 4
+          tz.transition 1946, 4, :o2, 58366531, 24
+          tz.transition 1946, 9, :o1, 9728371, 4
+          tz.transition 1947, 4, :o2, 58375267, 24
+          tz.transition 1947, 9, :o1, 9729827, 4
+          tz.transition 1948, 4, :o2, 58384003, 24
+          tz.transition 1948, 9, :o1, 9731283, 4
+          tz.transition 1949, 4, :o2, 58392739, 24
+          tz.transition 1949, 9, :o1, 9732739, 4
+          tz.transition 1950, 4, :o2, 58401643, 24
+          tz.transition 1950, 9, :o1, 9734195, 4
+          tz.transition 1951, 4, :o2, 58410379, 24
+          tz.transition 1951, 9, :o1, 9735679, 4
+          tz.transition 1952, 4, :o2, 58419115, 24
+          tz.transition 1952, 9, :o1, 9737135, 4
+          tz.transition 1953, 4, :o2, 58427851, 24
+          tz.transition 1953, 9, :o1, 9738591, 4
+          tz.transition 1954, 4, :o2, 58436587, 24
+          tz.transition 1954, 9, :o1, 9740047, 4
+          tz.transition 1955, 4, :o2, 58445323, 24
+          tz.transition 1955, 10, :o1, 9741643, 4
+          tz.transition 1956, 4, :o2, 58454227, 24
+          tz.transition 1956, 10, :o1, 9743099, 4
+          tz.transition 1957, 4, :o2, 58462963, 24
+          tz.transition 1957, 10, :o1, 9744555, 4
+          tz.transition 1958, 4, :o2, 58471699, 24
+          tz.transition 1958, 10, :o1, 9746011, 4
+          tz.transition 1959, 4, :o2, 58480435, 24
+          tz.transition 1959, 10, :o1, 9747467, 4
+          tz.transition 1960, 4, :o2, 58489171, 24
+          tz.transition 1960, 10, :o1, 9748951, 4
+          tz.transition 1961, 4, :o2, 58498075, 24
+          tz.transition 1961, 10, :o1, 9750407, 4
+          tz.transition 1962, 4, :o2, 58506811, 24
+          tz.transition 1962, 10, :o1, 9751863, 4
+          tz.transition 1963, 4, :o2, 58515547, 24
+          tz.transition 1963, 10, :o1, 9753319, 4
+          tz.transition 1964, 4, :o2, 58524283, 24
+          tz.transition 1964, 10, :o1, 9754775, 4
+          tz.transition 1965, 4, :o2, 58533019, 24
+          tz.transition 1965, 10, :o1, 9756259, 4
+          tz.transition 1966, 4, :o2, 58541755, 24
+          tz.transition 1966, 10, :o1, 9757715, 4
+          tz.transition 1967, 4, :o2, 58550659, 24
+          tz.transition 1967, 10, :o1, 9759171, 4
+          tz.transition 1968, 4, :o2, 58559395, 24
+          tz.transition 1968, 10, :o1, 9760627, 4
+          tz.transition 1969, 4, :o2, 58568131, 24
+          tz.transition 1969, 10, :o1, 9762083, 4
+          tz.transition 1970, 4, :o2, 9961200
+          tz.transition 1970, 10, :o1, 25682400
+          tz.transition 1971, 4, :o2, 41410800
+          tz.transition 1971, 10, :o1, 57736800
+          tz.transition 1972, 4, :o2, 73465200
+          tz.transition 1972, 10, :o1, 89186400
+          tz.transition 1973, 4, :o2, 104914800
+          tz.transition 1973, 10, :o1, 120636000
+          tz.transition 1974, 1, :o2, 126687600
+          tz.transition 1974, 10, :o1, 152085600
+          tz.transition 1975, 2, :o2, 162370800
+          tz.transition 1975, 10, :o1, 183535200
+          tz.transition 1976, 4, :o2, 199263600
+          tz.transition 1976, 10, :o1, 215589600
+          tz.transition 1977, 4, :o2, 230713200
+          tz.transition 1977, 10, :o1, 247039200
+          tz.transition 1978, 4, :o2, 262767600
+          tz.transition 1978, 10, :o1, 278488800
+          tz.transition 1979, 4, :o2, 294217200
+          tz.transition 1979, 10, :o1, 309938400
+          tz.transition 1980, 4, :o2, 325666800
+          tz.transition 1980, 10, :o1, 341388000
+          tz.transition 1981, 4, :o2, 357116400
+          tz.transition 1981, 10, :o1, 372837600
+          tz.transition 1982, 4, :o2, 388566000
+          tz.transition 1982, 10, :o1, 404892000
+          tz.transition 1983, 4, :o2, 420015600
+          tz.transition 1983, 10, :o1, 436341600
+          tz.transition 1984, 4, :o2, 452070000
+          tz.transition 1984, 10, :o1, 467791200
+          tz.transition 1985, 4, :o2, 483519600
+          tz.transition 1985, 10, :o1, 499240800
+          tz.transition 1986, 4, :o2, 514969200
+          tz.transition 1986, 10, :o1, 530690400
+          tz.transition 1987, 4, :o2, 544604400
+          tz.transition 1987, 10, :o1, 562140000
+          tz.transition 1988, 4, :o2, 576054000
+          tz.transition 1988, 10, :o1, 594194400
+          tz.transition 1989, 4, :o2, 607503600
+          tz.transition 1989, 10, :o1, 625644000
+          tz.transition 1990, 4, :o2, 638953200
+          tz.transition 1990, 10, :o1, 657093600
+          tz.transition 1991, 4, :o2, 671007600
+          tz.transition 1991, 10, :o1, 688543200
+          tz.transition 1992, 4, :o2, 702457200
+          tz.transition 1992, 10, :o1, 719992800
+          tz.transition 1993, 4, :o2, 733906800
+          tz.transition 1993, 10, :o1, 752047200
+          tz.transition 1994, 4, :o2, 765356400
+          tz.transition 1994, 10, :o1, 783496800
+          tz.transition 1995, 4, :o2, 796806000
+          tz.transition 1995, 10, :o1, 814946400
+          tz.transition 1996, 4, :o2, 828860400
+          tz.transition 1996, 10, :o1, 846396000
+          tz.transition 1997, 4, :o2, 860310000
+          tz.transition 1997, 10, :o1, 877845600
+          tz.transition 1998, 4, :o2, 891759600
+          tz.transition 1998, 10, :o1, 909295200
+          tz.transition 1999, 4, :o2, 923209200
+          tz.transition 1999, 10, :o1, 941349600
+          tz.transition 2000, 4, :o2, 954658800
+          tz.transition 2000, 10, :o1, 972799200
+          tz.transition 2001, 4, :o2, 986108400
+          tz.transition 2001, 10, :o1, 1004248800
+          tz.transition 2002, 4, :o2, 1018162800
+          tz.transition 2002, 10, :o1, 1035698400
+          tz.transition 2003, 4, :o2, 1049612400
+          tz.transition 2003, 10, :o1, 1067148000
+          tz.transition 2004, 4, :o2, 1081062000
+          tz.transition 2004, 10, :o1, 1099202400
+          tz.transition 2005, 4, :o2, 1112511600
+          tz.transition 2005, 10, :o1, 1130652000
+          tz.transition 2006, 4, :o2, 1143961200
+          tz.transition 2006, 10, :o1, 1162101600
+          tz.transition 2007, 3, :o2, 1173596400
+          tz.transition 2007, 11, :o1, 1194156000
+          tz.transition 2008, 3, :o2, 1205046000
+          tz.transition 2008, 11, :o1, 1225605600
+          tz.transition 2009, 3, :o2, 1236495600
+          tz.transition 2009, 11, :o1, 1257055200
+          tz.transition 2010, 3, :o2, 1268550000
+          tz.transition 2010, 11, :o1, 1289109600
+          tz.transition 2011, 3, :o2, 1299999600
+          tz.transition 2011, 11, :o1, 1320559200
+          tz.transition 2012, 3, :o2, 1331449200
+          tz.transition 2012, 11, :o1, 1352008800
+          tz.transition 2013, 3, :o2, 1362898800
+          tz.transition 2013, 11, :o1, 1383458400
+          tz.transition 2014, 3, :o2, 1394348400
+          tz.transition 2014, 11, :o1, 1414908000
+          tz.transition 2015, 3, :o2, 1425798000
+          tz.transition 2015, 11, :o1, 1446357600
+          tz.transition 2016, 3, :o2, 1457852400
+          tz.transition 2016, 11, :o1, 1478412000
+          tz.transition 2017, 3, :o2, 1489302000
+          tz.transition 2017, 11, :o1, 1509861600
+          tz.transition 2018, 3, :o2, 1520751600
+          tz.transition 2018, 11, :o1, 1541311200
+          tz.transition 2019, 3, :o2, 1552201200
+          tz.transition 2019, 11, :o1, 1572760800
+          tz.transition 2020, 3, :o2, 1583650800
+          tz.transition 2020, 11, :o1, 1604210400
+          tz.transition 2021, 3, :o2, 1615705200
+          tz.transition 2021, 11, :o1, 1636264800
+          tz.transition 2022, 3, :o2, 1647154800
+          tz.transition 2022, 11, :o1, 1667714400
+          tz.transition 2023, 3, :o2, 1678604400
+          tz.transition 2023, 11, :o1, 1699164000
+          tz.transition 2024, 3, :o2, 1710054000
+          tz.transition 2024, 11, :o1, 1730613600
+          tz.transition 2025, 3, :o2, 1741503600
+          tz.transition 2025, 11, :o1, 1762063200
+          tz.transition 2026, 3, :o2, 1772953200
+          tz.transition 2026, 11, :o1, 1793512800
+          tz.transition 2027, 3, :o2, 1805007600
+          tz.transition 2027, 11, :o1, 1825567200
+          tz.transition 2028, 3, :o2, 1836457200
+          tz.transition 2028, 11, :o1, 1857016800
+          tz.transition 2029, 3, :o2, 1867906800
+          tz.transition 2029, 11, :o1, 1888466400
+          tz.transition 2030, 3, :o2, 1899356400
+          tz.transition 2030, 11, :o1, 1919916000
+          tz.transition 2031, 3, :o2, 1930806000
+          tz.transition 2031, 11, :o1, 1951365600
+          tz.transition 2032, 3, :o2, 1962860400
+          tz.transition 2032, 11, :o1, 1983420000
+          tz.transition 2033, 3, :o2, 1994310000
+          tz.transition 2033, 11, :o1, 2014869600
+          tz.transition 2034, 3, :o2, 2025759600
+          tz.transition 2034, 11, :o1, 2046319200
+          tz.transition 2035, 3, :o2, 2057209200
+          tz.transition 2035, 11, :o1, 2077768800
+          tz.transition 2036, 3, :o2, 2088658800
+          tz.transition 2036, 11, :o1, 2109218400
+          tz.transition 2037, 3, :o2, 2120108400
+          tz.transition 2037, 11, :o1, 2140668000
+          tz.transition 2038, 3, :o2, 59171923, 24
+          tz.transition 2038, 11, :o1, 9862939, 4
+          tz.transition 2039, 3, :o2, 59180659, 24
+          tz.transition 2039, 11, :o1, 9864395, 4
+          tz.transition 2040, 3, :o2, 59189395, 24
+          tz.transition 2040, 11, :o1, 9865851, 4
+          tz.transition 2041, 3, :o2, 59198131, 24
+          tz.transition 2041, 11, :o1, 9867307, 4
+          tz.transition 2042, 3, :o2, 59206867, 24
+          tz.transition 2042, 11, :o1, 9868763, 4
+          tz.transition 2043, 3, :o2, 59215603, 24
+          tz.transition 2043, 11, :o1, 9870219, 4
+          tz.transition 2044, 3, :o2, 59224507, 24
+          tz.transition 2044, 11, :o1, 9871703, 4
+          tz.transition 2045, 3, :o2, 59233243, 24
+          tz.transition 2045, 11, :o1, 9873159, 4
+          tz.transition 2046, 3, :o2, 59241979, 24
+          tz.transition 2046, 11, :o1, 9874615, 4
+          tz.transition 2047, 3, :o2, 59250715, 24
+          tz.transition 2047, 11, :o1, 9876071, 4
+          tz.transition 2048, 3, :o2, 59259451, 24
+          tz.transition 2048, 11, :o1, 9877527, 4
+          tz.transition 2049, 3, :o2, 59268355, 24
+          tz.transition 2049, 11, :o1, 9879011, 4
+          tz.transition 2050, 3, :o2, 59277091, 24
+          tz.transition 2050, 11, :o1, 9880467, 4
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Phoenix.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Phoenix.rb
new file mode 100644
index 00000000..b514e0c0
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Phoenix.rb
@@ -0,0 +1,30 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Phoenix
+        include TimezoneDefinition
+        
+        timezone 'America/Phoenix' do |tz|
+          tz.offset :o0, -26898, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -25200, 3600, :MDT
+          tz.offset :o3, -25200, 3600, :MWT
+          
+          tz.transition 1883, 11, :o1, 57819199, 24
+          tz.transition 1918, 3, :o2, 19373471, 8
+          tz.transition 1918, 10, :o1, 14531363, 6
+          tz.transition 1919, 3, :o2, 19376383, 8
+          tz.transition 1919, 10, :o1, 14533547, 6
+          tz.transition 1942, 2, :o3, 19443199, 8
+          tz.transition 1944, 1, :o1, 3500770681, 1440
+          tz.transition 1944, 4, :o3, 3500901781, 1440
+          tz.transition 1944, 10, :o1, 3501165241, 1440
+          tz.transition 1967, 4, :o2, 19516887, 8
+          tz.transition 1967, 10, :o1, 14638757, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Regina.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Regina.rb
new file mode 100644
index 00000000..ebdb6881
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Regina.rb
@@ -0,0 +1,74 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Regina
+        include TimezoneDefinition
+        
+        timezone 'America/Regina' do |tz|
+          tz.offset :o0, -25116, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -25200, 3600, :MDT
+          tz.offset :o3, -25200, 3600, :MWT
+          tz.offset :o4, -25200, 3600, :MPT
+          tz.offset :o5, -21600, 0, :CST
+          
+          tz.transition 1905, 9, :o1, 17403046493, 7200
+          tz.transition 1918, 4, :o2, 19373583, 8
+          tz.transition 1918, 10, :o1, 14531387, 6
+          tz.transition 1930, 5, :o2, 58226419, 24
+          tz.transition 1930, 10, :o1, 9705019, 4
+          tz.transition 1931, 5, :o2, 58235155, 24
+          tz.transition 1931, 10, :o1, 9706475, 4
+          tz.transition 1932, 5, :o2, 58243891, 24
+          tz.transition 1932, 10, :o1, 9707931, 4
+          tz.transition 1933, 5, :o2, 58252795, 24
+          tz.transition 1933, 10, :o1, 9709387, 4
+          tz.transition 1934, 5, :o2, 58261531, 24
+          tz.transition 1934, 10, :o1, 9710871, 4
+          tz.transition 1937, 4, :o2, 58287235, 24
+          tz.transition 1937, 10, :o1, 9715267, 4
+          tz.transition 1938, 4, :o2, 58295971, 24
+          tz.transition 1938, 10, :o1, 9716695, 4
+          tz.transition 1939, 4, :o2, 58304707, 24
+          tz.transition 1939, 10, :o1, 9718179, 4
+          tz.transition 1940, 4, :o2, 58313611, 24
+          tz.transition 1940, 10, :o1, 9719663, 4
+          tz.transition 1941, 4, :o2, 58322347, 24
+          tz.transition 1941, 10, :o1, 9721119, 4
+          tz.transition 1942, 2, :o3, 19443199, 8
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o1, 14590373, 6
+          tz.transition 1946, 4, :o2, 19455399, 8
+          tz.transition 1946, 10, :o1, 14592641, 6
+          tz.transition 1947, 4, :o2, 19458423, 8
+          tz.transition 1947, 9, :o1, 14594741, 6
+          tz.transition 1948, 4, :o2, 19461335, 8
+          tz.transition 1948, 9, :o1, 14596925, 6
+          tz.transition 1949, 4, :o2, 19464247, 8
+          tz.transition 1949, 9, :o1, 14599109, 6
+          tz.transition 1950, 4, :o2, 19467215, 8
+          tz.transition 1950, 9, :o1, 14601293, 6
+          tz.transition 1951, 4, :o2, 19470127, 8
+          tz.transition 1951, 9, :o1, 14603519, 6
+          tz.transition 1952, 4, :o2, 19473039, 8
+          tz.transition 1952, 9, :o1, 14605703, 6
+          tz.transition 1953, 4, :o2, 19475951, 8
+          tz.transition 1953, 9, :o1, 14607887, 6
+          tz.transition 1954, 4, :o2, 19478863, 8
+          tz.transition 1954, 9, :o1, 14610071, 6
+          tz.transition 1955, 4, :o2, 19481775, 8
+          tz.transition 1955, 9, :o1, 14612255, 6
+          tz.transition 1956, 4, :o2, 19484743, 8
+          tz.transition 1956, 9, :o1, 14614481, 6
+          tz.transition 1957, 4, :o2, 19487655, 8
+          tz.transition 1957, 9, :o1, 14616665, 6
+          tz.transition 1959, 4, :o2, 19493479, 8
+          tz.transition 1959, 10, :o1, 14621201, 6
+          tz.transition 1960, 4, :o5, 19496391, 8
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Santiago.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Santiago.rb
new file mode 100644
index 00000000..0287c9eb
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Santiago.rb
@@ -0,0 +1,205 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Santiago
+        include TimezoneDefinition
+        
+        timezone 'America/Santiago' do |tz|
+          tz.offset :o0, -16966, 0, :LMT
+          tz.offset :o1, -16966, 0, :SMT
+          tz.offset :o2, -18000, 0, :CLT
+          tz.offset :o3, -14400, 0, :CLT
+          tz.offset :o4, -18000, 3600, :CLST
+          tz.offset :o5, -14400, 3600, :CLST
+          
+          tz.transition 1890, 1, :o1, 104171127683, 43200
+          tz.transition 1910, 1, :o2, 104486660483, 43200
+          tz.transition 1916, 7, :o1, 58105097, 24
+          tz.transition 1918, 9, :o3, 104623388483, 43200
+          tz.transition 1919, 7, :o1, 7266422, 3
+          tz.transition 1927, 9, :o4, 104765386883, 43200
+          tz.transition 1928, 4, :o2, 7276013, 3
+          tz.transition 1928, 9, :o4, 58211777, 24
+          tz.transition 1929, 4, :o2, 7277108, 3
+          tz.transition 1929, 9, :o4, 58220537, 24
+          tz.transition 1930, 4, :o2, 7278203, 3
+          tz.transition 1930, 9, :o4, 58229297, 24
+          tz.transition 1931, 4, :o2, 7279298, 3
+          tz.transition 1931, 9, :o4, 58238057, 24
+          tz.transition 1932, 4, :o2, 7280396, 3
+          tz.transition 1932, 9, :o4, 58246841, 24
+          tz.transition 1942, 6, :o2, 7291535, 3
+          tz.transition 1942, 8, :o4, 58333745, 24
+          tz.transition 1946, 9, :o2, 19456517, 8
+          tz.transition 1947, 5, :o3, 58375865, 24
+          tz.transition 1968, 11, :o5, 7320491, 3
+          tz.transition 1969, 3, :o3, 19522485, 8
+          tz.transition 1969, 11, :o5, 7321646, 3
+          tz.transition 1970, 3, :o3, 7527600
+          tz.transition 1970, 10, :o5, 24465600
+          tz.transition 1971, 3, :o3, 37767600
+          tz.transition 1971, 10, :o5, 55915200
+          tz.transition 1972, 3, :o3, 69217200
+          tz.transition 1972, 10, :o5, 87969600
+          tz.transition 1973, 3, :o3, 100666800
+          tz.transition 1973, 9, :o5, 118209600
+          tz.transition 1974, 3, :o3, 132116400
+          tz.transition 1974, 10, :o5, 150868800
+          tz.transition 1975, 3, :o3, 163566000
+          tz.transition 1975, 10, :o5, 182318400
+          tz.transition 1976, 3, :o3, 195620400
+          tz.transition 1976, 10, :o5, 213768000
+          tz.transition 1977, 3, :o3, 227070000
+          tz.transition 1977, 10, :o5, 245217600
+          tz.transition 1978, 3, :o3, 258519600
+          tz.transition 1978, 10, :o5, 277272000
+          tz.transition 1979, 3, :o3, 289969200
+          tz.transition 1979, 10, :o5, 308721600
+          tz.transition 1980, 3, :o3, 321418800
+          tz.transition 1980, 10, :o5, 340171200
+          tz.transition 1981, 3, :o3, 353473200
+          tz.transition 1981, 10, :o5, 371620800
+          tz.transition 1982, 3, :o3, 384922800
+          tz.transition 1982, 10, :o5, 403070400
+          tz.transition 1983, 3, :o3, 416372400
+          tz.transition 1983, 10, :o5, 434520000
+          tz.transition 1984, 3, :o3, 447822000
+          tz.transition 1984, 10, :o5, 466574400
+          tz.transition 1985, 3, :o3, 479271600
+          tz.transition 1985, 10, :o5, 498024000
+          tz.transition 1986, 3, :o3, 510721200
+          tz.transition 1986, 10, :o5, 529473600
+          tz.transition 1987, 4, :o3, 545194800
+          tz.transition 1987, 10, :o5, 560923200
+          tz.transition 1988, 3, :o3, 574225200
+          tz.transition 1988, 10, :o5, 591768000
+          tz.transition 1989, 3, :o3, 605674800
+          tz.transition 1989, 10, :o5, 624427200
+          tz.transition 1990, 3, :o3, 637729200
+          tz.transition 1990, 9, :o5, 653457600
+          tz.transition 1991, 3, :o3, 668574000
+          tz.transition 1991, 10, :o5, 687326400
+          tz.transition 1992, 3, :o3, 700628400
+          tz.transition 1992, 10, :o5, 718776000
+          tz.transition 1993, 3, :o3, 732078000
+          tz.transition 1993, 10, :o5, 750225600
+          tz.transition 1994, 3, :o3, 763527600
+          tz.transition 1994, 10, :o5, 781675200
+          tz.transition 1995, 3, :o3, 794977200
+          tz.transition 1995, 10, :o5, 813729600
+          tz.transition 1996, 3, :o3, 826426800
+          tz.transition 1996, 10, :o5, 845179200
+          tz.transition 1997, 3, :o3, 859690800
+          tz.transition 1997, 10, :o5, 876628800
+          tz.transition 1998, 3, :o3, 889930800
+          tz.transition 1998, 9, :o5, 906868800
+          tz.transition 1999, 4, :o3, 923194800
+          tz.transition 1999, 10, :o5, 939528000
+          tz.transition 2000, 3, :o3, 952830000
+          tz.transition 2000, 10, :o5, 971582400
+          tz.transition 2001, 3, :o3, 984279600
+          tz.transition 2001, 10, :o5, 1003032000
+          tz.transition 2002, 3, :o3, 1015729200
+          tz.transition 2002, 10, :o5, 1034481600
+          tz.transition 2003, 3, :o3, 1047178800
+          tz.transition 2003, 10, :o5, 1065931200
+          tz.transition 2004, 3, :o3, 1079233200
+          tz.transition 2004, 10, :o5, 1097380800
+          tz.transition 2005, 3, :o3, 1110682800
+          tz.transition 2005, 10, :o5, 1128830400
+          tz.transition 2006, 3, :o3, 1142132400
+          tz.transition 2006, 10, :o5, 1160884800
+          tz.transition 2007, 3, :o3, 1173582000
+          tz.transition 2007, 10, :o5, 1192334400
+          tz.transition 2008, 3, :o3, 1206846000
+          tz.transition 2008, 10, :o5, 1223784000
+          tz.transition 2009, 3, :o3, 1237086000
+          tz.transition 2009, 10, :o5, 1255233600
+          tz.transition 2010, 3, :o3, 1268535600
+          tz.transition 2010, 10, :o5, 1286683200
+          tz.transition 2011, 3, :o3, 1299985200
+          tz.transition 2011, 10, :o5, 1318132800
+          tz.transition 2012, 3, :o3, 1331434800
+          tz.transition 2012, 10, :o5, 1350187200
+          tz.transition 2013, 3, :o3, 1362884400
+          tz.transition 2013, 10, :o5, 1381636800
+          tz.transition 2014, 3, :o3, 1394334000
+          tz.transition 2014, 10, :o5, 1413086400
+          tz.transition 2015, 3, :o3, 1426388400
+          tz.transition 2015, 10, :o5, 1444536000
+          tz.transition 2016, 3, :o3, 1457838000
+          tz.transition 2016, 10, :o5, 1475985600
+          tz.transition 2017, 3, :o3, 1489287600
+          tz.transition 2017, 10, :o5, 1508040000
+          tz.transition 2018, 3, :o3, 1520737200
+          tz.transition 2018, 10, :o5, 1539489600
+          tz.transition 2019, 3, :o3, 1552186800
+          tz.transition 2019, 10, :o5, 1570939200
+          tz.transition 2020, 3, :o3, 1584241200
+          tz.transition 2020, 10, :o5, 1602388800
+          tz.transition 2021, 3, :o3, 1615690800
+          tz.transition 2021, 10, :o5, 1633838400
+          tz.transition 2022, 3, :o3, 1647140400
+          tz.transition 2022, 10, :o5, 1665288000
+          tz.transition 2023, 3, :o3, 1678590000
+          tz.transition 2023, 10, :o5, 1697342400
+          tz.transition 2024, 3, :o3, 1710039600
+          tz.transition 2024, 10, :o5, 1728792000
+          tz.transition 2025, 3, :o3, 1741489200
+          tz.transition 2025, 10, :o5, 1760241600
+          tz.transition 2026, 3, :o3, 1773543600
+          tz.transition 2026, 10, :o5, 1791691200
+          tz.transition 2027, 3, :o3, 1804993200
+          tz.transition 2027, 10, :o5, 1823140800
+          tz.transition 2028, 3, :o3, 1836442800
+          tz.transition 2028, 10, :o5, 1855195200
+          tz.transition 2029, 3, :o3, 1867892400
+          tz.transition 2029, 10, :o5, 1886644800
+          tz.transition 2030, 3, :o3, 1899342000
+          tz.transition 2030, 10, :o5, 1918094400
+          tz.transition 2031, 3, :o3, 1930791600
+          tz.transition 2031, 10, :o5, 1949544000
+          tz.transition 2032, 3, :o3, 1962846000
+          tz.transition 2032, 10, :o5, 1980993600
+          tz.transition 2033, 3, :o3, 1994295600
+          tz.transition 2033, 10, :o5, 2012443200
+          tz.transition 2034, 3, :o3, 2025745200
+          tz.transition 2034, 10, :o5, 2044497600
+          tz.transition 2035, 3, :o3, 2057194800
+          tz.transition 2035, 10, :o5, 2075947200
+          tz.transition 2036, 3, :o3, 2088644400
+          tz.transition 2036, 10, :o5, 2107396800
+          tz.transition 2037, 3, :o3, 2120698800
+          tz.transition 2037, 10, :o5, 2138846400
+          tz.transition 2038, 3, :o3, 19723973, 8
+          tz.transition 2038, 10, :o5, 7397120, 3
+          tz.transition 2039, 3, :o3, 19726885, 8
+          tz.transition 2039, 10, :o5, 7398212, 3
+          tz.transition 2040, 3, :o3, 19729797, 8
+          tz.transition 2040, 10, :o5, 7399325, 3
+          tz.transition 2041, 3, :o3, 19732709, 8
+          tz.transition 2041, 10, :o5, 7400417, 3
+          tz.transition 2042, 3, :o3, 19735621, 8
+          tz.transition 2042, 10, :o5, 7401509, 3
+          tz.transition 2043, 3, :o3, 19738589, 8
+          tz.transition 2043, 10, :o5, 7402601, 3
+          tz.transition 2044, 3, :o3, 19741501, 8
+          tz.transition 2044, 10, :o5, 7403693, 3
+          tz.transition 2045, 3, :o3, 19744413, 8
+          tz.transition 2045, 10, :o5, 7404806, 3
+          tz.transition 2046, 3, :o3, 19747325, 8
+          tz.transition 2046, 10, :o5, 7405898, 3
+          tz.transition 2047, 3, :o3, 19750237, 8
+          tz.transition 2047, 10, :o5, 7406990, 3
+          tz.transition 2048, 3, :o3, 19753205, 8
+          tz.transition 2048, 10, :o5, 7408082, 3
+          tz.transition 2049, 3, :o3, 19756117, 8
+          tz.transition 2049, 10, :o5, 7409174, 3
+          tz.transition 2050, 3, :o3, 19759029, 8
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/St_Johns.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/St_Johns.rb
new file mode 100644
index 00000000..e4a3599d
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/St_Johns.rb
@@ -0,0 +1,288 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module St_Johns
+        include TimezoneDefinition
+        
+        timezone 'America/St_Johns' do |tz|
+          tz.offset :o0, -12652, 0, :LMT
+          tz.offset :o1, -12652, 0, :NST
+          tz.offset :o2, -12652, 3600, :NDT
+          tz.offset :o3, -12600, 0, :NST
+          tz.offset :o4, -12600, 3600, :NDT
+          tz.offset :o5, -12600, 3600, :NWT
+          tz.offset :o6, -12600, 3600, :NPT
+          tz.offset :o7, -12600, 7200, :NDDT
+          
+          tz.transition 1884, 1, :o1, 52038215563, 21600
+          tz.transition 1917, 4, :o2, 52300657363, 21600
+          tz.transition 1917, 9, :o1, 52304155663, 21600
+          tz.transition 1918, 4, :o2, 52308670963, 21600
+          tz.transition 1918, 10, :o1, 52312990063, 21600
+          tz.transition 1919, 5, :o2, 52317027463, 21600
+          tz.transition 1919, 8, :o1, 52319164963, 21600
+          tz.transition 1920, 5, :o2, 52324868263, 21600
+          tz.transition 1920, 11, :o1, 52328798563, 21600
+          tz.transition 1921, 5, :o2, 52332730663, 21600
+          tz.transition 1921, 10, :o1, 52336660963, 21600
+          tz.transition 1922, 5, :o2, 52340744263, 21600
+          tz.transition 1922, 10, :o1, 52344523363, 21600
+          tz.transition 1923, 5, :o2, 52348606663, 21600
+          tz.transition 1923, 10, :o1, 52352385763, 21600
+          tz.transition 1924, 5, :o2, 52356469063, 21600
+          tz.transition 1924, 10, :o1, 52360248163, 21600
+          tz.transition 1925, 5, :o2, 52364331463, 21600
+          tz.transition 1925, 10, :o1, 52368110563, 21600
+          tz.transition 1926, 5, :o2, 52372193863, 21600
+          tz.transition 1926, 11, :o1, 52376124163, 21600
+          tz.transition 1927, 5, :o2, 52380056263, 21600
+          tz.transition 1927, 10, :o1, 52383986563, 21600
+          tz.transition 1928, 5, :o2, 52388069863, 21600
+          tz.transition 1928, 10, :o1, 52391848963, 21600
+          tz.transition 1929, 5, :o2, 52395932263, 21600
+          tz.transition 1929, 10, :o1, 52399711363, 21600
+          tz.transition 1930, 5, :o2, 52403794663, 21600
+          tz.transition 1930, 10, :o1, 52407573763, 21600
+          tz.transition 1931, 5, :o2, 52411657063, 21600
+          tz.transition 1931, 10, :o1, 52415436163, 21600
+          tz.transition 1932, 5, :o2, 52419519463, 21600
+          tz.transition 1932, 10, :o1, 52423449763, 21600
+          tz.transition 1933, 5, :o2, 52427533063, 21600
+          tz.transition 1933, 10, :o1, 52431312163, 21600
+          tz.transition 1934, 5, :o2, 52435395463, 21600
+          tz.transition 1934, 10, :o1, 52439174563, 21600
+          tz.transition 1935, 3, :o3, 52442459563, 21600
+          tz.transition 1935, 5, :o4, 116540573, 48
+          tz.transition 1935, 10, :o3, 38849657, 16
+          tz.transition 1936, 5, :o4, 116558383, 48
+          tz.transition 1936, 10, :o3, 116565437, 48
+          tz.transition 1937, 5, :o4, 116575855, 48
+          tz.transition 1937, 10, :o3, 116582909, 48
+          tz.transition 1938, 5, :o4, 116593327, 48
+          tz.transition 1938, 10, :o3, 116600381, 48
+          tz.transition 1939, 5, :o4, 116611135, 48
+          tz.transition 1939, 10, :o3, 116617853, 48
+          tz.transition 1940, 5, :o4, 116628607, 48
+          tz.transition 1940, 10, :o3, 116635661, 48
+          tz.transition 1941, 5, :o4, 116646079, 48
+          tz.transition 1941, 10, :o3, 116653133, 48
+          tz.transition 1942, 5, :o5, 116663551, 48
+          tz.transition 1945, 8, :o6, 58360379, 24
+          tz.transition 1945, 9, :o3, 38907659, 16
+          tz.transition 1946, 5, :o4, 116733731, 48
+          tz.transition 1946, 10, :o3, 38913595, 16
+          tz.transition 1947, 5, :o4, 116751203, 48
+          tz.transition 1947, 10, :o3, 38919419, 16
+          tz.transition 1948, 5, :o4, 116768675, 48
+          tz.transition 1948, 10, :o3, 38925243, 16
+          tz.transition 1949, 5, :o4, 116786147, 48
+          tz.transition 1949, 10, :o3, 38931067, 16
+          tz.transition 1950, 5, :o4, 116803955, 48
+          tz.transition 1950, 10, :o3, 38937003, 16
+          tz.transition 1951, 4, :o4, 116820755, 48
+          tz.transition 1951, 9, :o3, 38942715, 16
+          tz.transition 1952, 4, :o4, 116838227, 48
+          tz.transition 1952, 9, :o3, 38948539, 16
+          tz.transition 1953, 4, :o4, 116855699, 48
+          tz.transition 1953, 9, :o3, 38954363, 16
+          tz.transition 1954, 4, :o4, 116873171, 48
+          tz.transition 1954, 9, :o3, 38960187, 16
+          tz.transition 1955, 4, :o4, 116890643, 48
+          tz.transition 1955, 9, :o3, 38966011, 16
+          tz.transition 1956, 4, :o4, 116908451, 48
+          tz.transition 1956, 9, :o3, 38971947, 16
+          tz.transition 1957, 4, :o4, 116925923, 48
+          tz.transition 1957, 9, :o3, 38977771, 16
+          tz.transition 1958, 4, :o4, 116943395, 48
+          tz.transition 1958, 9, :o3, 38983595, 16
+          tz.transition 1959, 4, :o4, 116960867, 48
+          tz.transition 1959, 9, :o3, 38989419, 16
+          tz.transition 1960, 4, :o4, 116978339, 48
+          tz.transition 1960, 10, :o3, 38995803, 16
+          tz.transition 1961, 4, :o4, 116996147, 48
+          tz.transition 1961, 10, :o3, 39001627, 16
+          tz.transition 1962, 4, :o4, 117013619, 48
+          tz.transition 1962, 10, :o3, 39007451, 16
+          tz.transition 1963, 4, :o4, 117031091, 48
+          tz.transition 1963, 10, :o3, 39013275, 16
+          tz.transition 1964, 4, :o4, 117048563, 48
+          tz.transition 1964, 10, :o3, 39019099, 16
+          tz.transition 1965, 4, :o4, 117066035, 48
+          tz.transition 1965, 10, :o3, 39025035, 16
+          tz.transition 1966, 4, :o4, 117083507, 48
+          tz.transition 1966, 10, :o3, 39030859, 16
+          tz.transition 1967, 4, :o4, 117101315, 48
+          tz.transition 1967, 10, :o3, 39036683, 16
+          tz.transition 1968, 4, :o4, 117118787, 48
+          tz.transition 1968, 10, :o3, 39042507, 16
+          tz.transition 1969, 4, :o4, 117136259, 48
+          tz.transition 1969, 10, :o3, 39048331, 16
+          tz.transition 1970, 4, :o4, 9955800
+          tz.transition 1970, 10, :o3, 25677000
+          tz.transition 1971, 4, :o4, 41405400
+          tz.transition 1971, 10, :o3, 57731400
+          tz.transition 1972, 4, :o4, 73459800
+          tz.transition 1972, 10, :o3, 89181000
+          tz.transition 1973, 4, :o4, 104909400
+          tz.transition 1973, 10, :o3, 120630600
+          tz.transition 1974, 4, :o4, 136359000
+          tz.transition 1974, 10, :o3, 152080200
+          tz.transition 1975, 4, :o4, 167808600
+          tz.transition 1975, 10, :o3, 183529800
+          tz.transition 1976, 4, :o4, 199258200
+          tz.transition 1976, 10, :o3, 215584200
+          tz.transition 1977, 4, :o4, 230707800
+          tz.transition 1977, 10, :o3, 247033800
+          tz.transition 1978, 4, :o4, 262762200
+          tz.transition 1978, 10, :o3, 278483400
+          tz.transition 1979, 4, :o4, 294211800
+          tz.transition 1979, 10, :o3, 309933000
+          tz.transition 1980, 4, :o4, 325661400
+          tz.transition 1980, 10, :o3, 341382600
+          tz.transition 1981, 4, :o4, 357111000
+          tz.transition 1981, 10, :o3, 372832200
+          tz.transition 1982, 4, :o4, 388560600
+          tz.transition 1982, 10, :o3, 404886600
+          tz.transition 1983, 4, :o4, 420010200
+          tz.transition 1983, 10, :o3, 436336200
+          tz.transition 1984, 4, :o4, 452064600
+          tz.transition 1984, 10, :o3, 467785800
+          tz.transition 1985, 4, :o4, 483514200
+          tz.transition 1985, 10, :o3, 499235400
+          tz.transition 1986, 4, :o4, 514963800
+          tz.transition 1986, 10, :o3, 530685000
+          tz.transition 1987, 4, :o4, 544591860
+          tz.transition 1987, 10, :o3, 562127460
+          tz.transition 1988, 4, :o7, 576041460
+          tz.transition 1988, 10, :o3, 594178260
+          tz.transition 1989, 4, :o4, 607491060
+          tz.transition 1989, 10, :o3, 625631460
+          tz.transition 1990, 4, :o4, 638940660
+          tz.transition 1990, 10, :o3, 657081060
+          tz.transition 1991, 4, :o4, 670995060
+          tz.transition 1991, 10, :o3, 688530660
+          tz.transition 1992, 4, :o4, 702444660
+          tz.transition 1992, 10, :o3, 719980260
+          tz.transition 1993, 4, :o4, 733894260
+          tz.transition 1993, 10, :o3, 752034660
+          tz.transition 1994, 4, :o4, 765343860
+          tz.transition 1994, 10, :o3, 783484260
+          tz.transition 1995, 4, :o4, 796793460
+          tz.transition 1995, 10, :o3, 814933860
+          tz.transition 1996, 4, :o4, 828847860
+          tz.transition 1996, 10, :o3, 846383460
+          tz.transition 1997, 4, :o4, 860297460
+          tz.transition 1997, 10, :o3, 877833060
+          tz.transition 1998, 4, :o4, 891747060
+          tz.transition 1998, 10, :o3, 909282660
+          tz.transition 1999, 4, :o4, 923196660
+          tz.transition 1999, 10, :o3, 941337060
+          tz.transition 2000, 4, :o4, 954646260
+          tz.transition 2000, 10, :o3, 972786660
+          tz.transition 2001, 4, :o4, 986095860
+          tz.transition 2001, 10, :o3, 1004236260
+          tz.transition 2002, 4, :o4, 1018150260
+          tz.transition 2002, 10, :o3, 1035685860
+          tz.transition 2003, 4, :o4, 1049599860
+          tz.transition 2003, 10, :o3, 1067135460
+          tz.transition 2004, 4, :o4, 1081049460
+          tz.transition 2004, 10, :o3, 1099189860
+          tz.transition 2005, 4, :o4, 1112499060
+          tz.transition 2005, 10, :o3, 1130639460
+          tz.transition 2006, 4, :o4, 1143948660
+          tz.transition 2006, 10, :o3, 1162089060
+          tz.transition 2007, 3, :o4, 1173583860
+          tz.transition 2007, 11, :o3, 1194143460
+          tz.transition 2008, 3, :o4, 1205033460
+          tz.transition 2008, 11, :o3, 1225593060
+          tz.transition 2009, 3, :o4, 1236483060
+          tz.transition 2009, 11, :o3, 1257042660
+          tz.transition 2010, 3, :o4, 1268537460
+          tz.transition 2010, 11, :o3, 1289097060
+          tz.transition 2011, 3, :o4, 1299987060
+          tz.transition 2011, 11, :o3, 1320546660
+          tz.transition 2012, 3, :o4, 1331436660
+          tz.transition 2012, 11, :o3, 1351996260
+          tz.transition 2013, 3, :o4, 1362886260
+          tz.transition 2013, 11, :o3, 1383445860
+          tz.transition 2014, 3, :o4, 1394335860
+          tz.transition 2014, 11, :o3, 1414895460
+          tz.transition 2015, 3, :o4, 1425785460
+          tz.transition 2015, 11, :o3, 1446345060
+          tz.transition 2016, 3, :o4, 1457839860
+          tz.transition 2016, 11, :o3, 1478399460
+          tz.transition 2017, 3, :o4, 1489289460
+          tz.transition 2017, 11, :o3, 1509849060
+          tz.transition 2018, 3, :o4, 1520739060
+          tz.transition 2018, 11, :o3, 1541298660
+          tz.transition 2019, 3, :o4, 1552188660
+          tz.transition 2019, 11, :o3, 1572748260
+          tz.transition 2020, 3, :o4, 1583638260
+          tz.transition 2020, 11, :o3, 1604197860
+          tz.transition 2021, 3, :o4, 1615692660
+          tz.transition 2021, 11, :o3, 1636252260
+          tz.transition 2022, 3, :o4, 1647142260
+          tz.transition 2022, 11, :o3, 1667701860
+          tz.transition 2023, 3, :o4, 1678591860
+          tz.transition 2023, 11, :o3, 1699151460
+          tz.transition 2024, 3, :o4, 1710041460
+          tz.transition 2024, 11, :o3, 1730601060
+          tz.transition 2025, 3, :o4, 1741491060
+          tz.transition 2025, 11, :o3, 1762050660
+          tz.transition 2026, 3, :o4, 1772940660
+          tz.transition 2026, 11, :o3, 1793500260
+          tz.transition 2027, 3, :o4, 1804995060
+          tz.transition 2027, 11, :o3, 1825554660
+          tz.transition 2028, 3, :o4, 1836444660
+          tz.transition 2028, 11, :o3, 1857004260
+          tz.transition 2029, 3, :o4, 1867894260
+          tz.transition 2029, 11, :o3, 1888453860
+          tz.transition 2030, 3, :o4, 1899343860
+          tz.transition 2030, 11, :o3, 1919903460
+          tz.transition 2031, 3, :o4, 1930793460
+          tz.transition 2031, 11, :o3, 1951353060
+          tz.transition 2032, 3, :o4, 1962847860
+          tz.transition 2032, 11, :o3, 1983407460
+          tz.transition 2033, 3, :o4, 1994297460
+          tz.transition 2033, 11, :o3, 2014857060
+          tz.transition 2034, 3, :o4, 2025747060
+          tz.transition 2034, 11, :o3, 2046306660
+          tz.transition 2035, 3, :o4, 2057196660
+          tz.transition 2035, 11, :o3, 2077756260
+          tz.transition 2036, 3, :o4, 2088646260
+          tz.transition 2036, 11, :o3, 2109205860
+          tz.transition 2037, 3, :o4, 2120095860
+          tz.transition 2037, 11, :o3, 2140655460
+          tz.transition 2038, 3, :o4, 3550315171, 1440
+          tz.transition 2038, 11, :o3, 3550657831, 1440
+          tz.transition 2039, 3, :o4, 3550839331, 1440
+          tz.transition 2039, 11, :o3, 3551181991, 1440
+          tz.transition 2040, 3, :o4, 3551363491, 1440
+          tz.transition 2040, 11, :o3, 3551706151, 1440
+          tz.transition 2041, 3, :o4, 3551887651, 1440
+          tz.transition 2041, 11, :o3, 3552230311, 1440
+          tz.transition 2042, 3, :o4, 3552411811, 1440
+          tz.transition 2042, 11, :o3, 3552754471, 1440
+          tz.transition 2043, 3, :o4, 3552935971, 1440
+          tz.transition 2043, 11, :o3, 3553278631, 1440
+          tz.transition 2044, 3, :o4, 3553470211, 1440
+          tz.transition 2044, 11, :o3, 3553812871, 1440
+          tz.transition 2045, 3, :o4, 3553994371, 1440
+          tz.transition 2045, 11, :o3, 3554337031, 1440
+          tz.transition 2046, 3, :o4, 3554518531, 1440
+          tz.transition 2046, 11, :o3, 3554861191, 1440
+          tz.transition 2047, 3, :o4, 3555042691, 1440
+          tz.transition 2047, 11, :o3, 3555385351, 1440
+          tz.transition 2048, 3, :o4, 3555566851, 1440
+          tz.transition 2048, 11, :o3, 3555909511, 1440
+          tz.transition 2049, 3, :o4, 3556101091, 1440
+          tz.transition 2049, 11, :o3, 3556443751, 1440
+          tz.transition 2050, 3, :o4, 3556625251, 1440
+          tz.transition 2050, 11, :o3, 3556967911, 1440
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Tijuana.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Tijuana.rb
new file mode 100644
index 00000000..423059da
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Tijuana.rb
@@ -0,0 +1,196 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Tijuana
+        include TimezoneDefinition
+        
+        timezone 'America/Tijuana' do |tz|
+          tz.offset :o0, -28084, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -28800, 0, :PST
+          tz.offset :o3, -28800, 3600, :PDT
+          tz.offset :o4, -28800, 3600, :PWT
+          tz.offset :o5, -28800, 3600, :PPT
+          
+          tz.transition 1922, 1, :o1, 14538335, 6
+          tz.transition 1924, 1, :o2, 58170859, 24
+          tz.transition 1927, 6, :o1, 58201027, 24
+          tz.transition 1930, 11, :o2, 58231099, 24
+          tz.transition 1931, 4, :o3, 14558597, 6
+          tz.transition 1931, 9, :o2, 58238755, 24
+          tz.transition 1942, 4, :o4, 14582843, 6
+          tz.transition 1945, 8, :o5, 58360379, 24
+          tz.transition 1945, 11, :o2, 58362523, 24
+          tz.transition 1948, 4, :o3, 14595881, 6
+          tz.transition 1949, 1, :o2, 58390339, 24
+          tz.transition 1954, 4, :o3, 29218295, 12
+          tz.transition 1954, 9, :o2, 19480095, 8
+          tz.transition 1955, 4, :o3, 29222663, 12
+          tz.transition 1955, 9, :o2, 19483007, 8
+          tz.transition 1956, 4, :o3, 29227115, 12
+          tz.transition 1956, 9, :o2, 19485975, 8
+          tz.transition 1957, 4, :o3, 29231483, 12
+          tz.transition 1957, 9, :o2, 19488887, 8
+          tz.transition 1958, 4, :o3, 29235851, 12
+          tz.transition 1958, 9, :o2, 19491799, 8
+          tz.transition 1959, 4, :o3, 29240219, 12
+          tz.transition 1959, 9, :o2, 19494711, 8
+          tz.transition 1960, 4, :o3, 29244587, 12
+          tz.transition 1960, 9, :o2, 19497623, 8
+          tz.transition 1976, 4, :o3, 199274400
+          tz.transition 1976, 10, :o2, 215600400
+          tz.transition 1977, 4, :o3, 230724000
+          tz.transition 1977, 10, :o2, 247050000
+          tz.transition 1978, 4, :o3, 262778400
+          tz.transition 1978, 10, :o2, 278499600
+          tz.transition 1979, 4, :o3, 294228000
+          tz.transition 1979, 10, :o2, 309949200
+          tz.transition 1980, 4, :o3, 325677600
+          tz.transition 1980, 10, :o2, 341398800
+          tz.transition 1981, 4, :o3, 357127200
+          tz.transition 1981, 10, :o2, 372848400
+          tz.transition 1982, 4, :o3, 388576800
+          tz.transition 1982, 10, :o2, 404902800
+          tz.transition 1983, 4, :o3, 420026400
+          tz.transition 1983, 10, :o2, 436352400
+          tz.transition 1984, 4, :o3, 452080800
+          tz.transition 1984, 10, :o2, 467802000
+          tz.transition 1985, 4, :o3, 483530400
+          tz.transition 1985, 10, :o2, 499251600
+          tz.transition 1986, 4, :o3, 514980000
+          tz.transition 1986, 10, :o2, 530701200
+          tz.transition 1987, 4, :o3, 544615200
+          tz.transition 1987, 10, :o2, 562150800
+          tz.transition 1988, 4, :o3, 576064800
+          tz.transition 1988, 10, :o2, 594205200
+          tz.transition 1989, 4, :o3, 607514400
+          tz.transition 1989, 10, :o2, 625654800
+          tz.transition 1990, 4, :o3, 638964000
+          tz.transition 1990, 10, :o2, 657104400
+          tz.transition 1991, 4, :o3, 671018400
+          tz.transition 1991, 10, :o2, 688554000
+          tz.transition 1992, 4, :o3, 702468000
+          tz.transition 1992, 10, :o2, 720003600
+          tz.transition 1993, 4, :o3, 733917600
+          tz.transition 1993, 10, :o2, 752058000
+          tz.transition 1994, 4, :o3, 765367200
+          tz.transition 1994, 10, :o2, 783507600
+          tz.transition 1995, 4, :o3, 796816800
+          tz.transition 1995, 10, :o2, 814957200
+          tz.transition 1996, 4, :o3, 828871200
+          tz.transition 1996, 10, :o2, 846406800
+          tz.transition 1997, 4, :o3, 860320800
+          tz.transition 1997, 10, :o2, 877856400
+          tz.transition 1998, 4, :o3, 891770400
+          tz.transition 1998, 10, :o2, 909306000
+          tz.transition 1999, 4, :o3, 923220000
+          tz.transition 1999, 10, :o2, 941360400
+          tz.transition 2000, 4, :o3, 954669600
+          tz.transition 2000, 10, :o2, 972810000
+          tz.transition 2001, 4, :o3, 986119200
+          tz.transition 2001, 10, :o2, 1004259600
+          tz.transition 2002, 4, :o3, 1018173600
+          tz.transition 2002, 10, :o2, 1035709200
+          tz.transition 2003, 4, :o3, 1049623200
+          tz.transition 2003, 10, :o2, 1067158800
+          tz.transition 2004, 4, :o3, 1081072800
+          tz.transition 2004, 10, :o2, 1099213200
+          tz.transition 2005, 4, :o3, 1112522400
+          tz.transition 2005, 10, :o2, 1130662800
+          tz.transition 2006, 4, :o3, 1143972000
+          tz.transition 2006, 10, :o2, 1162112400
+          tz.transition 2007, 4, :o3, 1175421600
+          tz.transition 2007, 10, :o2, 1193562000
+          tz.transition 2008, 4, :o3, 1207476000
+          tz.transition 2008, 10, :o2, 1225011600
+          tz.transition 2009, 4, :o3, 1238925600
+          tz.transition 2009, 10, :o2, 1256461200
+          tz.transition 2010, 4, :o3, 1270375200
+          tz.transition 2010, 10, :o2, 1288515600
+          tz.transition 2011, 4, :o3, 1301824800
+          tz.transition 2011, 10, :o2, 1319965200
+          tz.transition 2012, 4, :o3, 1333274400
+          tz.transition 2012, 10, :o2, 1351414800
+          tz.transition 2013, 4, :o3, 1365328800
+          tz.transition 2013, 10, :o2, 1382864400
+          tz.transition 2014, 4, :o3, 1396778400
+          tz.transition 2014, 10, :o2, 1414314000
+          tz.transition 2015, 4, :o3, 1428228000
+          tz.transition 2015, 10, :o2, 1445763600
+          tz.transition 2016, 4, :o3, 1459677600
+          tz.transition 2016, 10, :o2, 1477818000
+          tz.transition 2017, 4, :o3, 1491127200
+          tz.transition 2017, 10, :o2, 1509267600
+          tz.transition 2018, 4, :o3, 1522576800
+          tz.transition 2018, 10, :o2, 1540717200
+          tz.transition 2019, 4, :o3, 1554631200
+          tz.transition 2019, 10, :o2, 1572166800
+          tz.transition 2020, 4, :o3, 1586080800
+          tz.transition 2020, 10, :o2, 1603616400
+          tz.transition 2021, 4, :o3, 1617530400
+          tz.transition 2021, 10, :o2, 1635670800
+          tz.transition 2022, 4, :o3, 1648980000
+          tz.transition 2022, 10, :o2, 1667120400
+          tz.transition 2023, 4, :o3, 1680429600
+          tz.transition 2023, 10, :o2, 1698570000
+          tz.transition 2024, 4, :o3, 1712484000
+          tz.transition 2024, 10, :o2, 1730019600
+          tz.transition 2025, 4, :o3, 1743933600
+          tz.transition 2025, 10, :o2, 1761469200
+          tz.transition 2026, 4, :o3, 1775383200
+          tz.transition 2026, 10, :o2, 1792918800
+          tz.transition 2027, 4, :o3, 1806832800
+          tz.transition 2027, 10, :o2, 1824973200
+          tz.transition 2028, 4, :o3, 1838282400
+          tz.transition 2028, 10, :o2, 1856422800
+          tz.transition 2029, 4, :o3, 1869732000
+          tz.transition 2029, 10, :o2, 1887872400
+          tz.transition 2030, 4, :o3, 1901786400
+          tz.transition 2030, 10, :o2, 1919322000
+          tz.transition 2031, 4, :o3, 1933236000
+          tz.transition 2031, 10, :o2, 1950771600
+          tz.transition 2032, 4, :o3, 1964685600
+          tz.transition 2032, 10, :o2, 1982826000
+          tz.transition 2033, 4, :o3, 1996135200
+          tz.transition 2033, 10, :o2, 2014275600
+          tz.transition 2034, 4, :o3, 2027584800
+          tz.transition 2034, 10, :o2, 2045725200
+          tz.transition 2035, 4, :o3, 2059034400
+          tz.transition 2035, 10, :o2, 2077174800
+          tz.transition 2036, 4, :o3, 2091088800
+          tz.transition 2036, 10, :o2, 2108624400
+          tz.transition 2037, 4, :o3, 2122538400
+          tz.transition 2037, 10, :o2, 2140074000
+          tz.transition 2038, 4, :o3, 29586215, 12
+          tz.transition 2038, 10, :o2, 19725823, 8
+          tz.transition 2039, 4, :o3, 29590583, 12
+          tz.transition 2039, 10, :o2, 19728735, 8
+          tz.transition 2040, 4, :o3, 29594951, 12
+          tz.transition 2040, 10, :o2, 19731647, 8
+          tz.transition 2041, 4, :o3, 29599403, 12
+          tz.transition 2041, 10, :o2, 19734559, 8
+          tz.transition 2042, 4, :o3, 29603771, 12
+          tz.transition 2042, 10, :o2, 19737471, 8
+          tz.transition 2043, 4, :o3, 29608139, 12
+          tz.transition 2043, 10, :o2, 19740383, 8
+          tz.transition 2044, 4, :o3, 29612507, 12
+          tz.transition 2044, 10, :o2, 19743351, 8
+          tz.transition 2045, 4, :o3, 29616875, 12
+          tz.transition 2045, 10, :o2, 19746263, 8
+          tz.transition 2046, 4, :o3, 29621243, 12
+          tz.transition 2046, 10, :o2, 19749175, 8
+          tz.transition 2047, 4, :o3, 29625695, 12
+          tz.transition 2047, 10, :o2, 19752087, 8
+          tz.transition 2048, 4, :o3, 29630063, 12
+          tz.transition 2048, 10, :o2, 19754999, 8
+          tz.transition 2049, 4, :o3, 29634431, 12
+          tz.transition 2049, 10, :o2, 19757967, 8
+          tz.transition 2050, 4, :o3, 29638799, 12
+          tz.transition 2050, 10, :o2, 19760879, 8
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Almaty.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Almaty.rb
new file mode 100644
index 00000000..9ee18970
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Almaty.rb
@@ -0,0 +1,67 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Almaty
+        include TimezoneDefinition
+        
+        timezone 'Asia/Almaty' do |tz|
+          tz.offset :o0, 18468, 0, :LMT
+          tz.offset :o1, 18000, 0, :ALMT
+          tz.offset :o2, 21600, 0, :ALMT
+          tz.offset :o3, 21600, 3600, :ALMST
+          
+          tz.transition 1924, 5, :o1, 1939125829, 800
+          tz.transition 1930, 6, :o2, 58227559, 24
+          tz.transition 1981, 3, :o3, 354909600
+          tz.transition 1981, 9, :o2, 370717200
+          tz.transition 1982, 3, :o3, 386445600
+          tz.transition 1982, 9, :o2, 402253200
+          tz.transition 1983, 3, :o3, 417981600
+          tz.transition 1983, 9, :o2, 433789200
+          tz.transition 1984, 3, :o3, 449604000
+          tz.transition 1984, 9, :o2, 465336000
+          tz.transition 1985, 3, :o3, 481060800
+          tz.transition 1985, 9, :o2, 496785600
+          tz.transition 1986, 3, :o3, 512510400
+          tz.transition 1986, 9, :o2, 528235200
+          tz.transition 1987, 3, :o3, 543960000
+          tz.transition 1987, 9, :o2, 559684800
+          tz.transition 1988, 3, :o3, 575409600
+          tz.transition 1988, 9, :o2, 591134400
+          tz.transition 1989, 3, :o3, 606859200
+          tz.transition 1989, 9, :o2, 622584000
+          tz.transition 1990, 3, :o3, 638308800
+          tz.transition 1990, 9, :o2, 654638400
+          tz.transition 1992, 3, :o3, 701802000
+          tz.transition 1992, 9, :o2, 717523200
+          tz.transition 1993, 3, :o3, 733262400
+          tz.transition 1993, 9, :o2, 748987200
+          tz.transition 1994, 3, :o3, 764712000
+          tz.transition 1994, 9, :o2, 780436800
+          tz.transition 1995, 3, :o3, 796161600
+          tz.transition 1995, 9, :o2, 811886400
+          tz.transition 1996, 3, :o3, 828216000
+          tz.transition 1996, 10, :o2, 846360000
+          tz.transition 1997, 3, :o3, 859665600
+          tz.transition 1997, 10, :o2, 877809600
+          tz.transition 1998, 3, :o3, 891115200
+          tz.transition 1998, 10, :o2, 909259200
+          tz.transition 1999, 3, :o3, 922564800
+          tz.transition 1999, 10, :o2, 941313600
+          tz.transition 2000, 3, :o3, 954014400
+          tz.transition 2000, 10, :o2, 972763200
+          tz.transition 2001, 3, :o3, 985464000
+          tz.transition 2001, 10, :o2, 1004212800
+          tz.transition 2002, 3, :o3, 1017518400
+          tz.transition 2002, 10, :o2, 1035662400
+          tz.transition 2003, 3, :o3, 1048968000
+          tz.transition 2003, 10, :o2, 1067112000
+          tz.transition 2004, 3, :o3, 1080417600
+          tz.transition 2004, 10, :o2, 1099166400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baghdad.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baghdad.rb
new file mode 100644
index 00000000..774dca15
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baghdad.rb
@@ -0,0 +1,73 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Baghdad
+        include TimezoneDefinition
+        
+        timezone 'Asia/Baghdad' do |tz|
+          tz.offset :o0, 10660, 0, :LMT
+          tz.offset :o1, 10656, 0, :BMT
+          tz.offset :o2, 10800, 0, :AST
+          tz.offset :o3, 10800, 3600, :ADT
+          
+          tz.transition 1889, 12, :o1, 10417111387, 4320
+          tz.transition 1917, 12, :o2, 726478313, 300
+          tz.transition 1982, 4, :o3, 389048400
+          tz.transition 1982, 9, :o2, 402264000
+          tz.transition 1983, 3, :o3, 417906000
+          tz.transition 1983, 9, :o2, 433800000
+          tz.transition 1984, 3, :o3, 449614800
+          tz.transition 1984, 9, :o2, 465422400
+          tz.transition 1985, 3, :o3, 481150800
+          tz.transition 1985, 9, :o2, 496792800
+          tz.transition 1986, 3, :o3, 512517600
+          tz.transition 1986, 9, :o2, 528242400
+          tz.transition 1987, 3, :o3, 543967200
+          tz.transition 1987, 9, :o2, 559692000
+          tz.transition 1988, 3, :o3, 575416800
+          tz.transition 1988, 9, :o2, 591141600
+          tz.transition 1989, 3, :o3, 606866400
+          tz.transition 1989, 9, :o2, 622591200
+          tz.transition 1990, 3, :o3, 638316000
+          tz.transition 1990, 9, :o2, 654645600
+          tz.transition 1991, 4, :o3, 670464000
+          tz.transition 1991, 10, :o2, 686275200
+          tz.transition 1992, 4, :o3, 702086400
+          tz.transition 1992, 10, :o2, 717897600
+          tz.transition 1993, 4, :o3, 733622400
+          tz.transition 1993, 10, :o2, 749433600
+          tz.transition 1994, 4, :o3, 765158400
+          tz.transition 1994, 10, :o2, 780969600
+          tz.transition 1995, 4, :o3, 796694400
+          tz.transition 1995, 10, :o2, 812505600
+          tz.transition 1996, 4, :o3, 828316800
+          tz.transition 1996, 10, :o2, 844128000
+          tz.transition 1997, 4, :o3, 859852800
+          tz.transition 1997, 10, :o2, 875664000
+          tz.transition 1998, 4, :o3, 891388800
+          tz.transition 1998, 10, :o2, 907200000
+          tz.transition 1999, 4, :o3, 922924800
+          tz.transition 1999, 10, :o2, 938736000
+          tz.transition 2000, 4, :o3, 954547200
+          tz.transition 2000, 10, :o2, 970358400
+          tz.transition 2001, 4, :o3, 986083200
+          tz.transition 2001, 10, :o2, 1001894400
+          tz.transition 2002, 4, :o3, 1017619200
+          tz.transition 2002, 10, :o2, 1033430400
+          tz.transition 2003, 4, :o3, 1049155200
+          tz.transition 2003, 10, :o2, 1064966400
+          tz.transition 2004, 4, :o3, 1080777600
+          tz.transition 2004, 10, :o2, 1096588800
+          tz.transition 2005, 4, :o3, 1112313600
+          tz.transition 2005, 10, :o2, 1128124800
+          tz.transition 2006, 4, :o3, 1143849600
+          tz.transition 2006, 10, :o2, 1159660800
+          tz.transition 2007, 4, :o3, 1175385600
+          tz.transition 2007, 10, :o2, 1191196800
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baku.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baku.rb
new file mode 100644
index 00000000..e86340eb
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baku.rb
@@ -0,0 +1,161 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Baku
+        include TimezoneDefinition
+        
+        timezone 'Asia/Baku' do |tz|
+          tz.offset :o0, 11964, 0, :LMT
+          tz.offset :o1, 10800, 0, :BAKT
+          tz.offset :o2, 14400, 0, :BAKT
+          tz.offset :o3, 14400, 3600, :BAKST
+          tz.offset :o4, 10800, 3600, :BAKST
+          tz.offset :o5, 10800, 3600, :AZST
+          tz.offset :o6, 10800, 0, :AZT
+          tz.offset :o7, 14400, 0, :AZT
+          tz.offset :o8, 14400, 3600, :AZST
+          
+          tz.transition 1924, 5, :o1, 17452133003, 7200
+          tz.transition 1957, 2, :o2, 19487187, 8
+          tz.transition 1981, 3, :o3, 354916800
+          tz.transition 1981, 9, :o2, 370724400
+          tz.transition 1982, 3, :o3, 386452800
+          tz.transition 1982, 9, :o2, 402260400
+          tz.transition 1983, 3, :o3, 417988800
+          tz.transition 1983, 9, :o2, 433796400
+          tz.transition 1984, 3, :o3, 449611200
+          tz.transition 1984, 9, :o2, 465343200
+          tz.transition 1985, 3, :o3, 481068000
+          tz.transition 1985, 9, :o2, 496792800
+          tz.transition 1986, 3, :o3, 512517600
+          tz.transition 1986, 9, :o2, 528242400
+          tz.transition 1987, 3, :o3, 543967200
+          tz.transition 1987, 9, :o2, 559692000
+          tz.transition 1988, 3, :o3, 575416800
+          tz.transition 1988, 9, :o2, 591141600
+          tz.transition 1989, 3, :o3, 606866400
+          tz.transition 1989, 9, :o2, 622591200
+          tz.transition 1990, 3, :o3, 638316000
+          tz.transition 1990, 9, :o2, 654645600
+          tz.transition 1991, 3, :o4, 670370400
+          tz.transition 1991, 8, :o5, 683496000
+          tz.transition 1991, 9, :o6, 686098800
+          tz.transition 1992, 3, :o5, 701812800
+          tz.transition 1992, 9, :o7, 717534000
+          tz.transition 1996, 3, :o8, 828234000
+          tz.transition 1996, 10, :o7, 846378000
+          tz.transition 1997, 3, :o8, 859680000
+          tz.transition 1997, 10, :o7, 877824000
+          tz.transition 1998, 3, :o8, 891129600
+          tz.transition 1998, 10, :o7, 909273600
+          tz.transition 1999, 3, :o8, 922579200
+          tz.transition 1999, 10, :o7, 941328000
+          tz.transition 2000, 3, :o8, 954028800
+          tz.transition 2000, 10, :o7, 972777600
+          tz.transition 2001, 3, :o8, 985478400
+          tz.transition 2001, 10, :o7, 1004227200
+          tz.transition 2002, 3, :o8, 1017532800
+          tz.transition 2002, 10, :o7, 1035676800
+          tz.transition 2003, 3, :o8, 1048982400
+          tz.transition 2003, 10, :o7, 1067126400
+          tz.transition 2004, 3, :o8, 1080432000
+          tz.transition 2004, 10, :o7, 1099180800
+          tz.transition 2005, 3, :o8, 1111881600
+          tz.transition 2005, 10, :o7, 1130630400
+          tz.transition 2006, 3, :o8, 1143331200
+          tz.transition 2006, 10, :o7, 1162080000
+          tz.transition 2007, 3, :o8, 1174780800
+          tz.transition 2007, 10, :o7, 1193529600
+          tz.transition 2008, 3, :o8, 1206835200
+          tz.transition 2008, 10, :o7, 1224979200
+          tz.transition 2009, 3, :o8, 1238284800
+          tz.transition 2009, 10, :o7, 1256428800
+          tz.transition 2010, 3, :o8, 1269734400
+          tz.transition 2010, 10, :o7, 1288483200
+          tz.transition 2011, 3, :o8, 1301184000
+          tz.transition 2011, 10, :o7, 1319932800
+          tz.transition 2012, 3, :o8, 1332633600
+          tz.transition 2012, 10, :o7, 1351382400
+          tz.transition 2013, 3, :o8, 1364688000
+          tz.transition 2013, 10, :o7, 1382832000
+          tz.transition 2014, 3, :o8, 1396137600
+          tz.transition 2014, 10, :o7, 1414281600
+          tz.transition 2015, 3, :o8, 1427587200
+          tz.transition 2015, 10, :o7, 1445731200
+          tz.transition 2016, 3, :o8, 1459036800
+          tz.transition 2016, 10, :o7, 1477785600
+          tz.transition 2017, 3, :o8, 1490486400
+          tz.transition 2017, 10, :o7, 1509235200
+          tz.transition 2018, 3, :o8, 1521936000
+          tz.transition 2018, 10, :o7, 1540684800
+          tz.transition 2019, 3, :o8, 1553990400
+          tz.transition 2019, 10, :o7, 1572134400
+          tz.transition 2020, 3, :o8, 1585440000
+          tz.transition 2020, 10, :o7, 1603584000
+          tz.transition 2021, 3, :o8, 1616889600
+          tz.transition 2021, 10, :o7, 1635638400
+          tz.transition 2022, 3, :o8, 1648339200
+          tz.transition 2022, 10, :o7, 1667088000
+          tz.transition 2023, 3, :o8, 1679788800
+          tz.transition 2023, 10, :o7, 1698537600
+          tz.transition 2024, 3, :o8, 1711843200
+          tz.transition 2024, 10, :o7, 1729987200
+          tz.transition 2025, 3, :o8, 1743292800
+          tz.transition 2025, 10, :o7, 1761436800
+          tz.transition 2026, 3, :o8, 1774742400
+          tz.transition 2026, 10, :o7, 1792886400
+          tz.transition 2027, 3, :o8, 1806192000
+          tz.transition 2027, 10, :o7, 1824940800
+          tz.transition 2028, 3, :o8, 1837641600
+          tz.transition 2028, 10, :o7, 1856390400
+          tz.transition 2029, 3, :o8, 1869091200
+          tz.transition 2029, 10, :o7, 1887840000
+          tz.transition 2030, 3, :o8, 1901145600
+          tz.transition 2030, 10, :o7, 1919289600
+          tz.transition 2031, 3, :o8, 1932595200
+          tz.transition 2031, 10, :o7, 1950739200
+          tz.transition 2032, 3, :o8, 1964044800
+          tz.transition 2032, 10, :o7, 1982793600
+          tz.transition 2033, 3, :o8, 1995494400
+          tz.transition 2033, 10, :o7, 2014243200
+          tz.transition 2034, 3, :o8, 2026944000
+          tz.transition 2034, 10, :o7, 2045692800
+          tz.transition 2035, 3, :o8, 2058393600
+          tz.transition 2035, 10, :o7, 2077142400
+          tz.transition 2036, 3, :o8, 2090448000
+          tz.transition 2036, 10, :o7, 2108592000
+          tz.transition 2037, 3, :o8, 2121897600
+          tz.transition 2037, 10, :o7, 2140041600
+          tz.transition 2038, 3, :o8, 4931021, 2
+          tz.transition 2038, 10, :o7, 4931455, 2
+          tz.transition 2039, 3, :o8, 4931749, 2
+          tz.transition 2039, 10, :o7, 4932183, 2
+          tz.transition 2040, 3, :o8, 4932477, 2
+          tz.transition 2040, 10, :o7, 4932911, 2
+          tz.transition 2041, 3, :o8, 4933219, 2
+          tz.transition 2041, 10, :o7, 4933639, 2
+          tz.transition 2042, 3, :o8, 4933947, 2
+          tz.transition 2042, 10, :o7, 4934367, 2
+          tz.transition 2043, 3, :o8, 4934675, 2
+          tz.transition 2043, 10, :o7, 4935095, 2
+          tz.transition 2044, 3, :o8, 4935403, 2
+          tz.transition 2044, 10, :o7, 4935837, 2
+          tz.transition 2045, 3, :o8, 4936131, 2
+          tz.transition 2045, 10, :o7, 4936565, 2
+          tz.transition 2046, 3, :o8, 4936859, 2
+          tz.transition 2046, 10, :o7, 4937293, 2
+          tz.transition 2047, 3, :o8, 4937601, 2
+          tz.transition 2047, 10, :o7, 4938021, 2
+          tz.transition 2048, 3, :o8, 4938329, 2
+          tz.transition 2048, 10, :o7, 4938749, 2
+          tz.transition 2049, 3, :o8, 4939057, 2
+          tz.transition 2049, 10, :o7, 4939491, 2
+          tz.transition 2050, 3, :o8, 4939785, 2
+          tz.transition 2050, 10, :o7, 4940219, 2
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Bangkok.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Bangkok.rb
new file mode 100644
index 00000000..139194e5
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Bangkok.rb
@@ -0,0 +1,20 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Bangkok
+        include TimezoneDefinition
+        
+        timezone 'Asia/Bangkok' do |tz|
+          tz.offset :o0, 24124, 0, :LMT
+          tz.offset :o1, 24124, 0, :BMT
+          tz.offset :o2, 25200, 0, :ICT
+          
+          tz.transition 1879, 12, :o1, 52006648769, 21600
+          tz.transition 1920, 3, :o2, 52324168769, 21600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Chongqing.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Chongqing.rb
new file mode 100644
index 00000000..8c94b4ba
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Chongqing.rb
@@ -0,0 +1,33 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Chongqing
+        include TimezoneDefinition
+        
+        timezone 'Asia/Chongqing' do |tz|
+          tz.offset :o0, 25580, 0, :LMT
+          tz.offset :o1, 25200, 0, :LONT
+          tz.offset :o2, 28800, 0, :CST
+          tz.offset :o3, 28800, 3600, :CDT
+          
+          tz.transition 1927, 12, :o1, 10477063601, 4320
+          tz.transition 1980, 4, :o2, 325962000
+          tz.transition 1986, 5, :o3, 515520000
+          tz.transition 1986, 9, :o2, 527007600
+          tz.transition 1987, 4, :o3, 545155200
+          tz.transition 1987, 9, :o2, 558457200
+          tz.transition 1988, 4, :o3, 576604800
+          tz.transition 1988, 9, :o2, 589906800
+          tz.transition 1989, 4, :o3, 608659200
+          tz.transition 1989, 9, :o2, 621961200
+          tz.transition 1990, 4, :o3, 640108800
+          tz.transition 1990, 9, :o2, 653410800
+          tz.transition 1991, 4, :o3, 671558400
+          tz.transition 1991, 9, :o2, 684860400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Dhaka.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Dhaka.rb
new file mode 100644
index 00000000..ccd02655
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Dhaka.rb
@@ -0,0 +1,27 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Dhaka
+        include TimezoneDefinition
+        
+        timezone 'Asia/Dhaka' do |tz|
+          tz.offset :o0, 21700, 0, :LMT
+          tz.offset :o1, 21200, 0, :HMT
+          tz.offset :o2, 23400, 0, :BURT
+          tz.offset :o3, 19800, 0, :IST
+          tz.offset :o4, 21600, 0, :DACT
+          tz.offset :o5, 21600, 0, :BDT
+          
+          tz.transition 1889, 12, :o1, 2083422167, 864
+          tz.transition 1941, 9, :o2, 524937943, 216
+          tz.transition 1942, 5, :o3, 116663723, 48
+          tz.transition 1942, 8, :o2, 116668957, 48
+          tz.transition 1951, 9, :o4, 116828123, 48
+          tz.transition 1971, 3, :o5, 38772000
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Hong_Kong.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Hong_Kong.rb
new file mode 100644
index 00000000..f1edd75a
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Hong_Kong.rb
@@ -0,0 +1,87 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Hong_Kong
+        include TimezoneDefinition
+        
+        timezone 'Asia/Hong_Kong' do |tz|
+          tz.offset :o0, 27396, 0, :LMT
+          tz.offset :o1, 28800, 0, :HKT
+          tz.offset :o2, 28800, 3600, :HKST
+          
+          tz.transition 1904, 10, :o1, 5800279639, 2400
+          tz.transition 1946, 4, :o2, 38910885, 16
+          tz.transition 1946, 11, :o1, 116743453, 48
+          tz.transition 1947, 4, :o2, 38916613, 16
+          tz.transition 1947, 12, :o1, 116762365, 48
+          tz.transition 1948, 5, :o2, 38922773, 16
+          tz.transition 1948, 10, :o1, 116777053, 48
+          tz.transition 1949, 4, :o2, 38928149, 16
+          tz.transition 1949, 10, :o1, 116794525, 48
+          tz.transition 1950, 4, :o2, 38933973, 16
+          tz.transition 1950, 10, :o1, 116811997, 48
+          tz.transition 1951, 3, :o2, 38939797, 16
+          tz.transition 1951, 10, :o1, 116829469, 48
+          tz.transition 1952, 4, :o2, 38945733, 16
+          tz.transition 1952, 10, :o1, 116846941, 48
+          tz.transition 1953, 4, :o2, 38951557, 16
+          tz.transition 1953, 10, :o1, 116864749, 48
+          tz.transition 1954, 3, :o2, 38957157, 16
+          tz.transition 1954, 10, :o1, 116882221, 48
+          tz.transition 1955, 3, :o2, 38962981, 16
+          tz.transition 1955, 11, :o1, 116900029, 48
+          tz.transition 1956, 3, :o2, 38968805, 16
+          tz.transition 1956, 11, :o1, 116917501, 48
+          tz.transition 1957, 3, :o2, 38974741, 16
+          tz.transition 1957, 11, :o1, 116934973, 48
+          tz.transition 1958, 3, :o2, 38980565, 16
+          tz.transition 1958, 11, :o1, 116952445, 48
+          tz.transition 1959, 3, :o2, 38986389, 16
+          tz.transition 1959, 10, :o1, 116969917, 48
+          tz.transition 1960, 3, :o2, 38992213, 16
+          tz.transition 1960, 11, :o1, 116987725, 48
+          tz.transition 1961, 3, :o2, 38998037, 16
+          tz.transition 1961, 11, :o1, 117005197, 48
+          tz.transition 1962, 3, :o2, 39003861, 16
+          tz.transition 1962, 11, :o1, 117022669, 48
+          tz.transition 1963, 3, :o2, 39009797, 16
+          tz.transition 1963, 11, :o1, 117040141, 48
+          tz.transition 1964, 3, :o2, 39015621, 16
+          tz.transition 1964, 10, :o1, 117057613, 48
+          tz.transition 1965, 4, :o2, 39021893, 16
+          tz.transition 1965, 10, :o1, 117074413, 48
+          tz.transition 1966, 4, :o2, 39027717, 16
+          tz.transition 1966, 10, :o1, 117091885, 48
+          tz.transition 1967, 4, :o2, 39033541, 16
+          tz.transition 1967, 10, :o1, 117109693, 48
+          tz.transition 1968, 4, :o2, 39039477, 16
+          tz.transition 1968, 10, :o1, 117127165, 48
+          tz.transition 1969, 4, :o2, 39045301, 16
+          tz.transition 1969, 10, :o1, 117144637, 48
+          tz.transition 1970, 4, :o2, 9315000
+          tz.transition 1970, 10, :o1, 25036200
+          tz.transition 1971, 4, :o2, 40764600
+          tz.transition 1971, 10, :o1, 56485800
+          tz.transition 1972, 4, :o2, 72214200
+          tz.transition 1972, 10, :o1, 88540200
+          tz.transition 1973, 4, :o2, 104268600
+          tz.transition 1973, 10, :o1, 119989800
+          tz.transition 1974, 4, :o2, 135718200
+          tz.transition 1974, 10, :o1, 151439400
+          tz.transition 1975, 4, :o2, 167167800
+          tz.transition 1975, 10, :o1, 182889000
+          tz.transition 1976, 4, :o2, 198617400
+          tz.transition 1976, 10, :o1, 214338600
+          tz.transition 1977, 4, :o2, 230067000
+          tz.transition 1977, 10, :o1, 245788200
+          tz.transition 1979, 5, :o2, 295385400
+          tz.transition 1979, 10, :o1, 309292200
+          tz.transition 1980, 5, :o2, 326835000
+          tz.transition 1980, 10, :o1, 340741800
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Irkutsk.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Irkutsk.rb
new file mode 100644
index 00000000..2d47d958
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Irkutsk.rb
@@ -0,0 +1,165 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Irkutsk
+        include TimezoneDefinition
+        
+        timezone 'Asia/Irkutsk' do |tz|
+          tz.offset :o0, 25040, 0, :LMT
+          tz.offset :o1, 25040, 0, :IMT
+          tz.offset :o2, 25200, 0, :IRKT
+          tz.offset :o3, 28800, 0, :IRKT
+          tz.offset :o4, 28800, 3600, :IRKST
+          tz.offset :o5, 25200, 3600, :IRKST
+          
+          tz.transition 1879, 12, :o1, 2600332427, 1080
+          tz.transition 1920, 1, :o2, 2616136067, 1080
+          tz.transition 1930, 6, :o3, 58227557, 24
+          tz.transition 1981, 3, :o4, 354902400
+          tz.transition 1981, 9, :o3, 370710000
+          tz.transition 1982, 3, :o4, 386438400
+          tz.transition 1982, 9, :o3, 402246000
+          tz.transition 1983, 3, :o4, 417974400
+          tz.transition 1983, 9, :o3, 433782000
+          tz.transition 1984, 3, :o4, 449596800
+          tz.transition 1984, 9, :o3, 465328800
+          tz.transition 1985, 3, :o4, 481053600
+          tz.transition 1985, 9, :o3, 496778400
+          tz.transition 1986, 3, :o4, 512503200
+          tz.transition 1986, 9, :o3, 528228000
+          tz.transition 1987, 3, :o4, 543952800
+          tz.transition 1987, 9, :o3, 559677600
+          tz.transition 1988, 3, :o4, 575402400
+          tz.transition 1988, 9, :o3, 591127200
+          tz.transition 1989, 3, :o4, 606852000
+          tz.transition 1989, 9, :o3, 622576800
+          tz.transition 1990, 3, :o4, 638301600
+          tz.transition 1990, 9, :o3, 654631200
+          tz.transition 1991, 3, :o5, 670356000
+          tz.transition 1991, 9, :o2, 686084400
+          tz.transition 1992, 1, :o3, 695761200
+          tz.transition 1992, 3, :o4, 701794800
+          tz.transition 1992, 9, :o3, 717516000
+          tz.transition 1993, 3, :o4, 733255200
+          tz.transition 1993, 9, :o3, 748980000
+          tz.transition 1994, 3, :o4, 764704800
+          tz.transition 1994, 9, :o3, 780429600
+          tz.transition 1995, 3, :o4, 796154400
+          tz.transition 1995, 9, :o3, 811879200
+          tz.transition 1996, 3, :o4, 828208800
+          tz.transition 1996, 10, :o3, 846352800
+          tz.transition 1997, 3, :o4, 859658400
+          tz.transition 1997, 10, :o3, 877802400
+          tz.transition 1998, 3, :o4, 891108000
+          tz.transition 1998, 10, :o3, 909252000
+          tz.transition 1999, 3, :o4, 922557600
+          tz.transition 1999, 10, :o3, 941306400
+          tz.transition 2000, 3, :o4, 954007200
+          tz.transition 2000, 10, :o3, 972756000
+          tz.transition 2001, 3, :o4, 985456800
+          tz.transition 2001, 10, :o3, 1004205600
+          tz.transition 2002, 3, :o4, 1017511200
+          tz.transition 2002, 10, :o3, 1035655200
+          tz.transition 2003, 3, :o4, 1048960800
+          tz.transition 2003, 10, :o3, 1067104800
+          tz.transition 2004, 3, :o4, 1080410400
+          tz.transition 2004, 10, :o3, 1099159200
+          tz.transition 2005, 3, :o4, 1111860000
+          tz.transition 2005, 10, :o3, 1130608800
+          tz.transition 2006, 3, :o4, 1143309600
+          tz.transition 2006, 10, :o3, 1162058400
+          tz.transition 2007, 3, :o4, 1174759200
+          tz.transition 2007, 10, :o3, 1193508000
+          tz.transition 2008, 3, :o4, 1206813600
+          tz.transition 2008, 10, :o3, 1224957600
+          tz.transition 2009, 3, :o4, 1238263200
+          tz.transition 2009, 10, :o3, 1256407200
+          tz.transition 2010, 3, :o4, 1269712800
+          tz.transition 2010, 10, :o3, 1288461600
+          tz.transition 2011, 3, :o4, 1301162400
+          tz.transition 2011, 10, :o3, 1319911200
+          tz.transition 2012, 3, :o4, 1332612000
+          tz.transition 2012, 10, :o3, 1351360800
+          tz.transition 2013, 3, :o4, 1364666400
+          tz.transition 2013, 10, :o3, 1382810400
+          tz.transition 2014, 3, :o4, 1396116000
+          tz.transition 2014, 10, :o3, 1414260000
+          tz.transition 2015, 3, :o4, 1427565600
+          tz.transition 2015, 10, :o3, 1445709600
+          tz.transition 2016, 3, :o4, 1459015200
+          tz.transition 2016, 10, :o3, 1477764000
+          tz.transition 2017, 3, :o4, 1490464800
+          tz.transition 2017, 10, :o3, 1509213600
+          tz.transition 2018, 3, :o4, 1521914400
+          tz.transition 2018, 10, :o3, 1540663200
+          tz.transition 2019, 3, :o4, 1553968800
+          tz.transition 2019, 10, :o3, 1572112800
+          tz.transition 2020, 3, :o4, 1585418400
+          tz.transition 2020, 10, :o3, 1603562400
+          tz.transition 2021, 3, :o4, 1616868000
+          tz.transition 2021, 10, :o3, 1635616800
+          tz.transition 2022, 3, :o4, 1648317600
+          tz.transition 2022, 10, :o3, 1667066400
+          tz.transition 2023, 3, :o4, 1679767200
+          tz.transition 2023, 10, :o3, 1698516000
+          tz.transition 2024, 3, :o4, 1711821600
+          tz.transition 2024, 10, :o3, 1729965600
+          tz.transition 2025, 3, :o4, 1743271200
+          tz.transition 2025, 10, :o3, 1761415200
+          tz.transition 2026, 3, :o4, 1774720800
+          tz.transition 2026, 10, :o3, 1792864800
+          tz.transition 2027, 3, :o4, 1806170400
+          tz.transition 2027, 10, :o3, 1824919200
+          tz.transition 2028, 3, :o4, 1837620000
+          tz.transition 2028, 10, :o3, 1856368800
+          tz.transition 2029, 3, :o4, 1869069600
+          tz.transition 2029, 10, :o3, 1887818400
+          tz.transition 2030, 3, :o4, 1901124000
+          tz.transition 2030, 10, :o3, 1919268000
+          tz.transition 2031, 3, :o4, 1932573600
+          tz.transition 2031, 10, :o3, 1950717600
+          tz.transition 2032, 3, :o4, 1964023200
+          tz.transition 2032, 10, :o3, 1982772000
+          tz.transition 2033, 3, :o4, 1995472800
+          tz.transition 2033, 10, :o3, 2014221600
+          tz.transition 2034, 3, :o4, 2026922400
+          tz.transition 2034, 10, :o3, 2045671200
+          tz.transition 2035, 3, :o4, 2058372000
+          tz.transition 2035, 10, :o3, 2077120800
+          tz.transition 2036, 3, :o4, 2090426400
+          tz.transition 2036, 10, :o3, 2108570400
+          tz.transition 2037, 3, :o4, 2121876000
+          tz.transition 2037, 10, :o3, 2140020000
+          tz.transition 2038, 3, :o4, 9862041, 4
+          tz.transition 2038, 10, :o3, 9862909, 4
+          tz.transition 2039, 3, :o4, 9863497, 4
+          tz.transition 2039, 10, :o3, 9864365, 4
+          tz.transition 2040, 3, :o4, 9864953, 4
+          tz.transition 2040, 10, :o3, 9865821, 4
+          tz.transition 2041, 3, :o4, 9866437, 4
+          tz.transition 2041, 10, :o3, 9867277, 4
+          tz.transition 2042, 3, :o4, 9867893, 4
+          tz.transition 2042, 10, :o3, 9868733, 4
+          tz.transition 2043, 3, :o4, 9869349, 4
+          tz.transition 2043, 10, :o3, 9870189, 4
+          tz.transition 2044, 3, :o4, 9870805, 4
+          tz.transition 2044, 10, :o3, 9871673, 4
+          tz.transition 2045, 3, :o4, 9872261, 4
+          tz.transition 2045, 10, :o3, 9873129, 4
+          tz.transition 2046, 3, :o4, 9873717, 4
+          tz.transition 2046, 10, :o3, 9874585, 4
+          tz.transition 2047, 3, :o4, 9875201, 4
+          tz.transition 2047, 10, :o3, 9876041, 4
+          tz.transition 2048, 3, :o4, 9876657, 4
+          tz.transition 2048, 10, :o3, 9877497, 4
+          tz.transition 2049, 3, :o4, 9878113, 4
+          tz.transition 2049, 10, :o3, 9878981, 4
+          tz.transition 2050, 3, :o4, 9879569, 4
+          tz.transition 2050, 10, :o3, 9880437, 4
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jakarta.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jakarta.rb
new file mode 100644
index 00000000..cc58fa17
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jakarta.rb
@@ -0,0 +1,30 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Jakarta
+        include TimezoneDefinition
+        
+        timezone 'Asia/Jakarta' do |tz|
+          tz.offset :o0, 25632, 0, :LMT
+          tz.offset :o1, 25632, 0, :JMT
+          tz.offset :o2, 26400, 0, :JAVT
+          tz.offset :o3, 27000, 0, :WIT
+          tz.offset :o4, 32400, 0, :JST
+          tz.offset :o5, 28800, 0, :WIT
+          tz.offset :o6, 25200, 0, :WIT
+          
+          tz.transition 1867, 8, :o1, 720956461, 300
+          tz.transition 1923, 12, :o2, 87256267, 36
+          tz.transition 1932, 10, :o3, 87372439, 36
+          tz.transition 1942, 3, :o4, 38887059, 16
+          tz.transition 1945, 9, :o3, 19453769, 8
+          tz.transition 1948, 4, :o5, 38922755, 16
+          tz.transition 1950, 4, :o3, 14600413, 6
+          tz.transition 1963, 12, :o6, 39014323, 16
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jerusalem.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jerusalem.rb
new file mode 100644
index 00000000..9b737b89
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jerusalem.rb
@@ -0,0 +1,163 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Jerusalem
+        include TimezoneDefinition
+        
+        timezone 'Asia/Jerusalem' do |tz|
+          tz.offset :o0, 8456, 0, :LMT
+          tz.offset :o1, 8440, 0, :JMT
+          tz.offset :o2, 7200, 0, :IST
+          tz.offset :o3, 7200, 3600, :IDT
+          tz.offset :o4, 7200, 7200, :IDDT
+          
+          tz.transition 1879, 12, :o1, 26003326343, 10800
+          tz.transition 1917, 12, :o2, 5230643909, 2160
+          tz.transition 1940, 5, :o3, 29157377, 12
+          tz.transition 1942, 10, :o2, 19445315, 8
+          tz.transition 1943, 4, :o3, 4861631, 2
+          tz.transition 1943, 10, :o2, 19448235, 8
+          tz.transition 1944, 3, :o3, 29174177, 12
+          tz.transition 1944, 10, :o2, 19451163, 8
+          tz.transition 1945, 4, :o3, 29178737, 12
+          tz.transition 1945, 10, :o2, 58362251, 24
+          tz.transition 1946, 4, :o3, 4863853, 2
+          tz.transition 1946, 10, :o2, 19457003, 8
+          tz.transition 1948, 5, :o4, 29192333, 12
+          tz.transition 1948, 8, :o3, 7298386, 3
+          tz.transition 1948, 10, :o2, 58388555, 24
+          tz.transition 1949, 4, :o3, 29196449, 12
+          tz.transition 1949, 10, :o2, 58397315, 24
+          tz.transition 1950, 4, :o3, 29200649, 12
+          tz.transition 1950, 9, :o2, 4867079, 2
+          tz.transition 1951, 3, :o3, 29204849, 12
+          tz.transition 1951, 11, :o2, 4867923, 2
+          tz.transition 1952, 4, :o3, 4868245, 2
+          tz.transition 1952, 10, :o2, 4868609, 2
+          tz.transition 1953, 4, :o3, 4868959, 2
+          tz.transition 1953, 9, :o2, 4869267, 2
+          tz.transition 1954, 6, :o3, 29218877, 12
+          tz.transition 1954, 9, :o2, 19479979, 8
+          tz.transition 1955, 6, :o3, 4870539, 2
+          tz.transition 1955, 9, :o2, 19482891, 8
+          tz.transition 1956, 6, :o3, 29227529, 12
+          tz.transition 1956, 9, :o2, 4871493, 2
+          tz.transition 1957, 4, :o3, 4871915, 2
+          tz.transition 1957, 9, :o2, 19488827, 8
+          tz.transition 1974, 7, :o3, 142380000
+          tz.transition 1974, 10, :o2, 150843600
+          tz.transition 1975, 4, :o3, 167176800
+          tz.transition 1975, 8, :o2, 178664400
+          tz.transition 1985, 4, :o3, 482277600
+          tz.transition 1985, 9, :o2, 495579600
+          tz.transition 1986, 5, :o3, 516751200
+          tz.transition 1986, 9, :o2, 526424400
+          tz.transition 1987, 4, :o3, 545436000
+          tz.transition 1987, 9, :o2, 558478800
+          tz.transition 1988, 4, :o3, 576540000
+          tz.transition 1988, 9, :o2, 589237200
+          tz.transition 1989, 4, :o3, 609890400
+          tz.transition 1989, 9, :o2, 620773200
+          tz.transition 1990, 3, :o3, 638316000
+          tz.transition 1990, 8, :o2, 651618000
+          tz.transition 1991, 3, :o3, 669765600
+          tz.transition 1991, 8, :o2, 683672400
+          tz.transition 1992, 3, :o3, 701820000
+          tz.transition 1992, 9, :o2, 715726800
+          tz.transition 1993, 4, :o3, 733701600
+          tz.transition 1993, 9, :o2, 747176400
+          tz.transition 1994, 3, :o3, 765151200
+          tz.transition 1994, 8, :o2, 778021200
+          tz.transition 1995, 3, :o3, 796600800
+          tz.transition 1995, 9, :o2, 810075600
+          tz.transition 1996, 3, :o3, 826840800
+          tz.transition 1996, 9, :o2, 842821200
+          tz.transition 1997, 3, :o3, 858895200
+          tz.transition 1997, 9, :o2, 874184400
+          tz.transition 1998, 3, :o3, 890344800
+          tz.transition 1998, 9, :o2, 905029200
+          tz.transition 1999, 4, :o3, 923011200
+          tz.transition 1999, 9, :o2, 936313200
+          tz.transition 2000, 4, :o3, 955670400
+          tz.transition 2000, 10, :o2, 970783200
+          tz.transition 2001, 4, :o3, 986770800
+          tz.transition 2001, 9, :o2, 1001282400
+          tz.transition 2002, 3, :o3, 1017356400
+          tz.transition 2002, 10, :o2, 1033941600
+          tz.transition 2003, 3, :o3, 1048806000
+          tz.transition 2003, 10, :o2, 1065132000
+          tz.transition 2004, 4, :o3, 1081292400
+          tz.transition 2004, 9, :o2, 1095804000
+          tz.transition 2005, 4, :o3, 1112313600
+          tz.transition 2005, 10, :o2, 1128812400
+          tz.transition 2006, 3, :o3, 1143763200
+          tz.transition 2006, 9, :o2, 1159657200
+          tz.transition 2007, 3, :o3, 1175212800
+          tz.transition 2007, 9, :o2, 1189897200
+          tz.transition 2008, 3, :o3, 1206662400
+          tz.transition 2008, 10, :o2, 1223161200
+          tz.transition 2009, 3, :o3, 1238112000
+          tz.transition 2009, 9, :o2, 1254006000
+          tz.transition 2010, 3, :o3, 1269561600
+          tz.transition 2010, 9, :o2, 1284246000
+          tz.transition 2011, 4, :o3, 1301616000
+          tz.transition 2011, 10, :o2, 1317510000
+          tz.transition 2012, 3, :o3, 1333065600
+          tz.transition 2012, 9, :o2, 1348354800
+          tz.transition 2013, 3, :o3, 1364515200
+          tz.transition 2013, 9, :o2, 1378594800
+          tz.transition 2014, 3, :o3, 1395964800
+          tz.transition 2014, 9, :o2, 1411858800
+          tz.transition 2015, 3, :o3, 1427414400
+          tz.transition 2015, 9, :o2, 1442703600
+          tz.transition 2016, 4, :o3, 1459468800
+          tz.transition 2016, 10, :o2, 1475967600
+          tz.transition 2017, 3, :o3, 1490918400
+          tz.transition 2017, 9, :o2, 1506207600
+          tz.transition 2018, 3, :o3, 1522368000
+          tz.transition 2018, 9, :o2, 1537052400
+          tz.transition 2019, 3, :o3, 1553817600
+          tz.transition 2019, 10, :o2, 1570316400
+          tz.transition 2020, 3, :o3, 1585267200
+          tz.transition 2020, 9, :o2, 1601161200
+          tz.transition 2021, 3, :o3, 1616716800
+          tz.transition 2021, 9, :o2, 1631401200
+          tz.transition 2022, 4, :o3, 1648771200
+          tz.transition 2022, 10, :o2, 1664665200
+          tz.transition 2023, 3, :o3, 1680220800
+          tz.transition 2023, 9, :o2, 1695510000
+          tz.transition 2024, 3, :o3, 1711670400
+          tz.transition 2024, 10, :o2, 1728169200
+          tz.transition 2025, 3, :o3, 1743120000
+          tz.transition 2025, 9, :o2, 1759014000
+          tz.transition 2026, 3, :o3, 1774569600
+          tz.transition 2026, 9, :o2, 1789858800
+          tz.transition 2027, 3, :o3, 1806019200
+          tz.transition 2027, 10, :o2, 1823122800
+          tz.transition 2028, 3, :o3, 1838073600
+          tz.transition 2028, 9, :o2, 1853362800
+          tz.transition 2029, 3, :o3, 1869523200
+          tz.transition 2029, 9, :o2, 1884207600
+          tz.transition 2030, 3, :o3, 1900972800
+          tz.transition 2030, 10, :o2, 1917471600
+          tz.transition 2031, 3, :o3, 1932422400
+          tz.transition 2031, 9, :o2, 1947711600
+          tz.transition 2032, 3, :o3, 1963872000
+          tz.transition 2032, 9, :o2, 1978556400
+          tz.transition 2033, 4, :o3, 1995926400
+          tz.transition 2033, 10, :o2, 2011820400
+          tz.transition 2034, 3, :o3, 2027376000
+          tz.transition 2034, 9, :o2, 2042060400
+          tz.transition 2035, 3, :o3, 2058825600
+          tz.transition 2035, 10, :o2, 2075324400
+          tz.transition 2036, 3, :o3, 2090275200
+          tz.transition 2036, 9, :o2, 2106169200
+          tz.transition 2037, 3, :o3, 2121724800
+          tz.transition 2037, 9, :o2, 2136409200
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kabul.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kabul.rb
new file mode 100644
index 00000000..669c0979
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kabul.rb
@@ -0,0 +1,20 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Kabul
+        include TimezoneDefinition
+        
+        timezone 'Asia/Kabul' do |tz|
+          tz.offset :o0, 16608, 0, :LMT
+          tz.offset :o1, 14400, 0, :AFT
+          tz.offset :o2, 16200, 0, :AFT
+          
+          tz.transition 1889, 12, :o1, 2170231477, 900
+          tz.transition 1944, 12, :o2, 7294369, 3
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kamchatka.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kamchatka.rb
new file mode 100644
index 00000000..2f1690b3
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kamchatka.rb
@@ -0,0 +1,163 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Kamchatka
+        include TimezoneDefinition
+        
+        timezone 'Asia/Kamchatka' do |tz|
+          tz.offset :o0, 38076, 0, :LMT
+          tz.offset :o1, 39600, 0, :PETT
+          tz.offset :o2, 43200, 0, :PETT
+          tz.offset :o3, 43200, 3600, :PETST
+          tz.offset :o4, 39600, 3600, :PETST
+          
+          tz.transition 1922, 11, :o1, 17448250027, 7200
+          tz.transition 1930, 6, :o2, 58227553, 24
+          tz.transition 1981, 3, :o3, 354888000
+          tz.transition 1981, 9, :o2, 370695600
+          tz.transition 1982, 3, :o3, 386424000
+          tz.transition 1982, 9, :o2, 402231600
+          tz.transition 1983, 3, :o3, 417960000
+          tz.transition 1983, 9, :o2, 433767600
+          tz.transition 1984, 3, :o3, 449582400
+          tz.transition 1984, 9, :o2, 465314400
+          tz.transition 1985, 3, :o3, 481039200
+          tz.transition 1985, 9, :o2, 496764000
+          tz.transition 1986, 3, :o3, 512488800
+          tz.transition 1986, 9, :o2, 528213600
+          tz.transition 1987, 3, :o3, 543938400
+          tz.transition 1987, 9, :o2, 559663200
+          tz.transition 1988, 3, :o3, 575388000
+          tz.transition 1988, 9, :o2, 591112800
+          tz.transition 1989, 3, :o3, 606837600
+          tz.transition 1989, 9, :o2, 622562400
+          tz.transition 1990, 3, :o3, 638287200
+          tz.transition 1990, 9, :o2, 654616800
+          tz.transition 1991, 3, :o4, 670341600
+          tz.transition 1991, 9, :o1, 686070000
+          tz.transition 1992, 1, :o2, 695746800
+          tz.transition 1992, 3, :o3, 701780400
+          tz.transition 1992, 9, :o2, 717501600
+          tz.transition 1993, 3, :o3, 733240800
+          tz.transition 1993, 9, :o2, 748965600
+          tz.transition 1994, 3, :o3, 764690400
+          tz.transition 1994, 9, :o2, 780415200
+          tz.transition 1995, 3, :o3, 796140000
+          tz.transition 1995, 9, :o2, 811864800
+          tz.transition 1996, 3, :o3, 828194400
+          tz.transition 1996, 10, :o2, 846338400
+          tz.transition 1997, 3, :o3, 859644000
+          tz.transition 1997, 10, :o2, 877788000
+          tz.transition 1998, 3, :o3, 891093600
+          tz.transition 1998, 10, :o2, 909237600
+          tz.transition 1999, 3, :o3, 922543200
+          tz.transition 1999, 10, :o2, 941292000
+          tz.transition 2000, 3, :o3, 953992800
+          tz.transition 2000, 10, :o2, 972741600
+          tz.transition 2001, 3, :o3, 985442400
+          tz.transition 2001, 10, :o2, 1004191200
+          tz.transition 2002, 3, :o3, 1017496800
+          tz.transition 2002, 10, :o2, 1035640800
+          tz.transition 2003, 3, :o3, 1048946400
+          tz.transition 2003, 10, :o2, 1067090400
+          tz.transition 2004, 3, :o3, 1080396000
+          tz.transition 2004, 10, :o2, 1099144800
+          tz.transition 2005, 3, :o3, 1111845600
+          tz.transition 2005, 10, :o2, 1130594400
+          tz.transition 2006, 3, :o3, 1143295200
+          tz.transition 2006, 10, :o2, 1162044000
+          tz.transition 2007, 3, :o3, 1174744800
+          tz.transition 2007, 10, :o2, 1193493600
+          tz.transition 2008, 3, :o3, 1206799200
+          tz.transition 2008, 10, :o2, 1224943200
+          tz.transition 2009, 3, :o3, 1238248800
+          tz.transition 2009, 10, :o2, 1256392800
+          tz.transition 2010, 3, :o3, 1269698400
+          tz.transition 2010, 10, :o2, 1288447200
+          tz.transition 2011, 3, :o3, 1301148000
+          tz.transition 2011, 10, :o2, 1319896800
+          tz.transition 2012, 3, :o3, 1332597600
+          tz.transition 2012, 10, :o2, 1351346400
+          tz.transition 2013, 3, :o3, 1364652000
+          tz.transition 2013, 10, :o2, 1382796000
+          tz.transition 2014, 3, :o3, 1396101600
+          tz.transition 2014, 10, :o2, 1414245600
+          tz.transition 2015, 3, :o3, 1427551200
+          tz.transition 2015, 10, :o2, 1445695200
+          tz.transition 2016, 3, :o3, 1459000800
+          tz.transition 2016, 10, :o2, 1477749600
+          tz.transition 2017, 3, :o3, 1490450400
+          tz.transition 2017, 10, :o2, 1509199200
+          tz.transition 2018, 3, :o3, 1521900000
+          tz.transition 2018, 10, :o2, 1540648800
+          tz.transition 2019, 3, :o3, 1553954400
+          tz.transition 2019, 10, :o2, 1572098400
+          tz.transition 2020, 3, :o3, 1585404000
+          tz.transition 2020, 10, :o2, 1603548000
+          tz.transition 2021, 3, :o3, 1616853600
+          tz.transition 2021, 10, :o2, 1635602400
+          tz.transition 2022, 3, :o3, 1648303200
+          tz.transition 2022, 10, :o2, 1667052000
+          tz.transition 2023, 3, :o3, 1679752800
+          tz.transition 2023, 10, :o2, 1698501600
+          tz.transition 2024, 3, :o3, 1711807200
+          tz.transition 2024, 10, :o2, 1729951200
+          tz.transition 2025, 3, :o3, 1743256800
+          tz.transition 2025, 10, :o2, 1761400800
+          tz.transition 2026, 3, :o3, 1774706400
+          tz.transition 2026, 10, :o2, 1792850400
+          tz.transition 2027, 3, :o3, 1806156000
+          tz.transition 2027, 10, :o2, 1824904800
+          tz.transition 2028, 3, :o3, 1837605600
+          tz.transition 2028, 10, :o2, 1856354400
+          tz.transition 2029, 3, :o3, 1869055200
+          tz.transition 2029, 10, :o2, 1887804000
+          tz.transition 2030, 3, :o3, 1901109600
+          tz.transition 2030, 10, :o2, 1919253600
+          tz.transition 2031, 3, :o3, 1932559200
+          tz.transition 2031, 10, :o2, 1950703200
+          tz.transition 2032, 3, :o3, 1964008800
+          tz.transition 2032, 10, :o2, 1982757600
+          tz.transition 2033, 3, :o3, 1995458400
+          tz.transition 2033, 10, :o2, 2014207200
+          tz.transition 2034, 3, :o3, 2026908000
+          tz.transition 2034, 10, :o2, 2045656800
+          tz.transition 2035, 3, :o3, 2058357600
+          tz.transition 2035, 10, :o2, 2077106400
+          tz.transition 2036, 3, :o3, 2090412000
+          tz.transition 2036, 10, :o2, 2108556000
+          tz.transition 2037, 3, :o3, 2121861600
+          tz.transition 2037, 10, :o2, 2140005600
+          tz.transition 2038, 3, :o3, 29586121, 12
+          tz.transition 2038, 10, :o2, 29588725, 12
+          tz.transition 2039, 3, :o3, 29590489, 12
+          tz.transition 2039, 10, :o2, 29593093, 12
+          tz.transition 2040, 3, :o3, 29594857, 12
+          tz.transition 2040, 10, :o2, 29597461, 12
+          tz.transition 2041, 3, :o3, 29599309, 12
+          tz.transition 2041, 10, :o2, 29601829, 12
+          tz.transition 2042, 3, :o3, 29603677, 12
+          tz.transition 2042, 10, :o2, 29606197, 12
+          tz.transition 2043, 3, :o3, 29608045, 12
+          tz.transition 2043, 10, :o2, 29610565, 12
+          tz.transition 2044, 3, :o3, 29612413, 12
+          tz.transition 2044, 10, :o2, 29615017, 12
+          tz.transition 2045, 3, :o3, 29616781, 12
+          tz.transition 2045, 10, :o2, 29619385, 12
+          tz.transition 2046, 3, :o3, 29621149, 12
+          tz.transition 2046, 10, :o2, 29623753, 12
+          tz.transition 2047, 3, :o3, 29625601, 12
+          tz.transition 2047, 10, :o2, 29628121, 12
+          tz.transition 2048, 3, :o3, 29629969, 12
+          tz.transition 2048, 10, :o2, 29632489, 12
+          tz.transition 2049, 3, :o3, 29634337, 12
+          tz.transition 2049, 10, :o2, 29636941, 12
+          tz.transition 2050, 3, :o3, 29638705, 12
+          tz.transition 2050, 10, :o2, 29641309, 12
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Karachi.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Karachi.rb
new file mode 100644
index 00000000..bd7656ef
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Karachi.rb
@@ -0,0 +1,30 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Karachi
+        include TimezoneDefinition
+        
+        timezone 'Asia/Karachi' do |tz|
+          tz.offset :o0, 16092, 0, :LMT
+          tz.offset :o1, 19800, 0, :IST
+          tz.offset :o2, 19800, 3600, :IST
+          tz.offset :o3, 18000, 0, :KART
+          tz.offset :o4, 18000, 0, :PKT
+          tz.offset :o5, 18000, 3600, :PKST
+          
+          tz.transition 1906, 12, :o1, 1934061051, 800
+          tz.transition 1942, 8, :o2, 116668957, 48
+          tz.transition 1945, 10, :o1, 116723675, 48
+          tz.transition 1951, 9, :o3, 116828125, 48
+          tz.transition 1971, 3, :o4, 38775600
+          tz.transition 2002, 4, :o5, 1018119660
+          tz.transition 2002, 10, :o4, 1033840860
+          tz.transition 2008, 5, :o5, 1212260400
+          tz.transition 2008, 8, :o4, 1220205600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Katmandu.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Katmandu.rb
new file mode 100644
index 00000000..37dbea1f
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Katmandu.rb
@@ -0,0 +1,20 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Katmandu
+        include TimezoneDefinition
+        
+        timezone 'Asia/Katmandu' do |tz|
+          tz.offset :o0, 20476, 0, :LMT
+          tz.offset :o1, 19800, 0, :IST
+          tz.offset :o2, 20700, 0, :NPT
+          
+          tz.transition 1919, 12, :o1, 52322204081, 21600
+          tz.transition 1985, 12, :o2, 504901800
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kolkata.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kolkata.rb
new file mode 100644
index 00000000..1b6ffbd5
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kolkata.rb
@@ -0,0 +1,25 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Kolkata
+        include TimezoneDefinition
+        
+        timezone 'Asia/Kolkata' do |tz|
+          tz.offset :o0, 21208, 0, :LMT
+          tz.offset :o1, 21200, 0, :HMT
+          tz.offset :o2, 23400, 0, :BURT
+          tz.offset :o3, 19800, 0, :IST
+          tz.offset :o4, 19800, 3600, :IST
+          
+          tz.transition 1879, 12, :o1, 26003324749, 10800
+          tz.transition 1941, 9, :o2, 524937943, 216
+          tz.transition 1942, 5, :o3, 116663723, 48
+          tz.transition 1942, 8, :o4, 116668957, 48
+          tz.transition 1945, 10, :o3, 116723675, 48
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Krasnoyarsk.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Krasnoyarsk.rb
new file mode 100644
index 00000000..d6c503c1
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Krasnoyarsk.rb
@@ -0,0 +1,163 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Krasnoyarsk
+        include TimezoneDefinition
+        
+        timezone 'Asia/Krasnoyarsk' do |tz|
+          tz.offset :o0, 22280, 0, :LMT
+          tz.offset :o1, 21600, 0, :KRAT
+          tz.offset :o2, 25200, 0, :KRAT
+          tz.offset :o3, 25200, 3600, :KRAST
+          tz.offset :o4, 21600, 3600, :KRAST
+          
+          tz.transition 1920, 1, :o1, 5232231163, 2160
+          tz.transition 1930, 6, :o2, 9704593, 4
+          tz.transition 1981, 3, :o3, 354906000
+          tz.transition 1981, 9, :o2, 370713600
+          tz.transition 1982, 3, :o3, 386442000
+          tz.transition 1982, 9, :o2, 402249600
+          tz.transition 1983, 3, :o3, 417978000
+          tz.transition 1983, 9, :o2, 433785600
+          tz.transition 1984, 3, :o3, 449600400
+          tz.transition 1984, 9, :o2, 465332400
+          tz.transition 1985, 3, :o3, 481057200
+          tz.transition 1985, 9, :o2, 496782000
+          tz.transition 1986, 3, :o3, 512506800
+          tz.transition 1986, 9, :o2, 528231600
+          tz.transition 1987, 3, :o3, 543956400
+          tz.transition 1987, 9, :o2, 559681200
+          tz.transition 1988, 3, :o3, 575406000
+          tz.transition 1988, 9, :o2, 591130800
+          tz.transition 1989, 3, :o3, 606855600
+          tz.transition 1989, 9, :o2, 622580400
+          tz.transition 1990, 3, :o3, 638305200
+          tz.transition 1990, 9, :o2, 654634800
+          tz.transition 1991, 3, :o4, 670359600
+          tz.transition 1991, 9, :o1, 686088000
+          tz.transition 1992, 1, :o2, 695764800
+          tz.transition 1992, 3, :o3, 701798400
+          tz.transition 1992, 9, :o2, 717519600
+          tz.transition 1993, 3, :o3, 733258800
+          tz.transition 1993, 9, :o2, 748983600
+          tz.transition 1994, 3, :o3, 764708400
+          tz.transition 1994, 9, :o2, 780433200
+          tz.transition 1995, 3, :o3, 796158000
+          tz.transition 1995, 9, :o2, 811882800
+          tz.transition 1996, 3, :o3, 828212400
+          tz.transition 1996, 10, :o2, 846356400
+          tz.transition 1997, 3, :o3, 859662000
+          tz.transition 1997, 10, :o2, 877806000
+          tz.transition 1998, 3, :o3, 891111600
+          tz.transition 1998, 10, :o2, 909255600
+          tz.transition 1999, 3, :o3, 922561200
+          tz.transition 1999, 10, :o2, 941310000
+          tz.transition 2000, 3, :o3, 954010800
+          tz.transition 2000, 10, :o2, 972759600
+          tz.transition 2001, 3, :o3, 985460400
+          tz.transition 2001, 10, :o2, 1004209200
+          tz.transition 2002, 3, :o3, 1017514800
+          tz.transition 2002, 10, :o2, 1035658800
+          tz.transition 2003, 3, :o3, 1048964400
+          tz.transition 2003, 10, :o2, 1067108400
+          tz.transition 2004, 3, :o3, 1080414000
+          tz.transition 2004, 10, :o2, 1099162800
+          tz.transition 2005, 3, :o3, 1111863600
+          tz.transition 2005, 10, :o2, 1130612400
+          tz.transition 2006, 3, :o3, 1143313200
+          tz.transition 2006, 10, :o2, 1162062000
+          tz.transition 2007, 3, :o3, 1174762800
+          tz.transition 2007, 10, :o2, 1193511600
+          tz.transition 2008, 3, :o3, 1206817200
+          tz.transition 2008, 10, :o2, 1224961200
+          tz.transition 2009, 3, :o3, 1238266800
+          tz.transition 2009, 10, :o2, 1256410800
+          tz.transition 2010, 3, :o3, 1269716400
+          tz.transition 2010, 10, :o2, 1288465200
+          tz.transition 2011, 3, :o3, 1301166000
+          tz.transition 2011, 10, :o2, 1319914800
+          tz.transition 2012, 3, :o3, 1332615600
+          tz.transition 2012, 10, :o2, 1351364400
+          tz.transition 2013, 3, :o3, 1364670000
+          tz.transition 2013, 10, :o2, 1382814000
+          tz.transition 2014, 3, :o3, 1396119600
+          tz.transition 2014, 10, :o2, 1414263600
+          tz.transition 2015, 3, :o3, 1427569200
+          tz.transition 2015, 10, :o2, 1445713200
+          tz.transition 2016, 3, :o3, 1459018800
+          tz.transition 2016, 10, :o2, 1477767600
+          tz.transition 2017, 3, :o3, 1490468400
+          tz.transition 2017, 10, :o2, 1509217200
+          tz.transition 2018, 3, :o3, 1521918000
+          tz.transition 2018, 10, :o2, 1540666800
+          tz.transition 2019, 3, :o3, 1553972400
+          tz.transition 2019, 10, :o2, 1572116400
+          tz.transition 2020, 3, :o3, 1585422000
+          tz.transition 2020, 10, :o2, 1603566000
+          tz.transition 2021, 3, :o3, 1616871600
+          tz.transition 2021, 10, :o2, 1635620400
+          tz.transition 2022, 3, :o3, 1648321200
+          tz.transition 2022, 10, :o2, 1667070000
+          tz.transition 2023, 3, :o3, 1679770800
+          tz.transition 2023, 10, :o2, 1698519600
+          tz.transition 2024, 3, :o3, 1711825200
+          tz.transition 2024, 10, :o2, 1729969200
+          tz.transition 2025, 3, :o3, 1743274800
+          tz.transition 2025, 10, :o2, 1761418800
+          tz.transition 2026, 3, :o3, 1774724400
+          tz.transition 2026, 10, :o2, 1792868400
+          tz.transition 2027, 3, :o3, 1806174000
+          tz.transition 2027, 10, :o2, 1824922800
+          tz.transition 2028, 3, :o3, 1837623600
+          tz.transition 2028, 10, :o2, 1856372400
+          tz.transition 2029, 3, :o3, 1869073200
+          tz.transition 2029, 10, :o2, 1887822000
+          tz.transition 2030, 3, :o3, 1901127600
+          tz.transition 2030, 10, :o2, 1919271600
+          tz.transition 2031, 3, :o3, 1932577200
+          tz.transition 2031, 10, :o2, 1950721200
+          tz.transition 2032, 3, :o3, 1964026800
+          tz.transition 2032, 10, :o2, 1982775600
+          tz.transition 2033, 3, :o3, 1995476400
+          tz.transition 2033, 10, :o2, 2014225200
+          tz.transition 2034, 3, :o3, 2026926000
+          tz.transition 2034, 10, :o2, 2045674800
+          tz.transition 2035, 3, :o3, 2058375600
+          tz.transition 2035, 10, :o2, 2077124400
+          tz.transition 2036, 3, :o3, 2090430000
+          tz.transition 2036, 10, :o2, 2108574000
+          tz.transition 2037, 3, :o3, 2121879600
+          tz.transition 2037, 10, :o2, 2140023600
+          tz.transition 2038, 3, :o3, 59172247, 24
+          tz.transition 2038, 10, :o2, 59177455, 24
+          tz.transition 2039, 3, :o3, 59180983, 24
+          tz.transition 2039, 10, :o2, 59186191, 24
+          tz.transition 2040, 3, :o3, 59189719, 24
+          tz.transition 2040, 10, :o2, 59194927, 24
+          tz.transition 2041, 3, :o3, 59198623, 24
+          tz.transition 2041, 10, :o2, 59203663, 24
+          tz.transition 2042, 3, :o3, 59207359, 24
+          tz.transition 2042, 10, :o2, 59212399, 24
+          tz.transition 2043, 3, :o3, 59216095, 24
+          tz.transition 2043, 10, :o2, 59221135, 24
+          tz.transition 2044, 3, :o3, 59224831, 24
+          tz.transition 2044, 10, :o2, 59230039, 24
+          tz.transition 2045, 3, :o3, 59233567, 24
+          tz.transition 2045, 10, :o2, 59238775, 24
+          tz.transition 2046, 3, :o3, 59242303, 24
+          tz.transition 2046, 10, :o2, 59247511, 24
+          tz.transition 2047, 3, :o3, 59251207, 24
+          tz.transition 2047, 10, :o2, 59256247, 24
+          tz.transition 2048, 3, :o3, 59259943, 24
+          tz.transition 2048, 10, :o2, 59264983, 24
+          tz.transition 2049, 3, :o3, 59268679, 24
+          tz.transition 2049, 10, :o2, 59273887, 24
+          tz.transition 2050, 3, :o3, 59277415, 24
+          tz.transition 2050, 10, :o2, 59282623, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuala_Lumpur.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuala_Lumpur.rb
new file mode 100644
index 00000000..77a0c206
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuala_Lumpur.rb
@@ -0,0 +1,31 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Kuala_Lumpur
+        include TimezoneDefinition
+        
+        timezone 'Asia/Kuala_Lumpur' do |tz|
+          tz.offset :o0, 24406, 0, :LMT
+          tz.offset :o1, 24925, 0, :SMT
+          tz.offset :o2, 25200, 0, :MALT
+          tz.offset :o3, 25200, 1200, :MALST
+          tz.offset :o4, 26400, 0, :MALT
+          tz.offset :o5, 27000, 0, :MALT
+          tz.offset :o6, 32400, 0, :JST
+          tz.offset :o7, 28800, 0, :MYT
+          
+          tz.transition 1900, 12, :o1, 104344641397, 43200
+          tz.transition 1905, 5, :o2, 8353142363, 3456
+          tz.transition 1932, 12, :o3, 58249757, 24
+          tz.transition 1935, 12, :o4, 87414055, 36
+          tz.transition 1941, 8, :o5, 87488575, 36
+          tz.transition 1942, 2, :o6, 38886499, 16
+          tz.transition 1945, 9, :o5, 19453681, 8
+          tz.transition 1981, 12, :o7, 378664200
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuwait.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuwait.rb
new file mode 100644
index 00000000..5bd52831
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuwait.rb
@@ -0,0 +1,18 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Kuwait
+        include TimezoneDefinition
+        
+        timezone 'Asia/Kuwait' do |tz|
+          tz.offset :o0, 11516, 0, :LMT
+          tz.offset :o1, 10800, 0, :AST
+          
+          tz.transition 1949, 12, :o1, 52558899121, 21600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Magadan.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Magadan.rb
new file mode 100644
index 00000000..30209369
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Magadan.rb
@@ -0,0 +1,163 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Magadan
+        include TimezoneDefinition
+        
+        timezone 'Asia/Magadan' do |tz|
+          tz.offset :o0, 36192, 0, :LMT
+          tz.offset :o1, 36000, 0, :MAGT
+          tz.offset :o2, 39600, 0, :MAGT
+          tz.offset :o3, 39600, 3600, :MAGST
+          tz.offset :o4, 36000, 3600, :MAGST
+          
+          tz.transition 1924, 5, :o1, 2181516373, 900
+          tz.transition 1930, 6, :o2, 29113777, 12
+          tz.transition 1981, 3, :o3, 354891600
+          tz.transition 1981, 9, :o2, 370699200
+          tz.transition 1982, 3, :o3, 386427600
+          tz.transition 1982, 9, :o2, 402235200
+          tz.transition 1983, 3, :o3, 417963600
+          tz.transition 1983, 9, :o2, 433771200
+          tz.transition 1984, 3, :o3, 449586000
+          tz.transition 1984, 9, :o2, 465318000
+          tz.transition 1985, 3, :o3, 481042800
+          tz.transition 1985, 9, :o2, 496767600
+          tz.transition 1986, 3, :o3, 512492400
+          tz.transition 1986, 9, :o2, 528217200
+          tz.transition 1987, 3, :o3, 543942000
+          tz.transition 1987, 9, :o2, 559666800
+          tz.transition 1988, 3, :o3, 575391600
+          tz.transition 1988, 9, :o2, 591116400
+          tz.transition 1989, 3, :o3, 606841200
+          tz.transition 1989, 9, :o2, 622566000
+          tz.transition 1990, 3, :o3, 638290800
+          tz.transition 1990, 9, :o2, 654620400
+          tz.transition 1991, 3, :o4, 670345200
+          tz.transition 1991, 9, :o1, 686073600
+          tz.transition 1992, 1, :o2, 695750400
+          tz.transition 1992, 3, :o3, 701784000
+          tz.transition 1992, 9, :o2, 717505200
+          tz.transition 1993, 3, :o3, 733244400
+          tz.transition 1993, 9, :o2, 748969200
+          tz.transition 1994, 3, :o3, 764694000
+          tz.transition 1994, 9, :o2, 780418800
+          tz.transition 1995, 3, :o3, 796143600
+          tz.transition 1995, 9, :o2, 811868400
+          tz.transition 1996, 3, :o3, 828198000
+          tz.transition 1996, 10, :o2, 846342000
+          tz.transition 1997, 3, :o3, 859647600
+          tz.transition 1997, 10, :o2, 877791600
+          tz.transition 1998, 3, :o3, 891097200
+          tz.transition 1998, 10, :o2, 909241200
+          tz.transition 1999, 3, :o3, 922546800
+          tz.transition 1999, 10, :o2, 941295600
+          tz.transition 2000, 3, :o3, 953996400
+          tz.transition 2000, 10, :o2, 972745200
+          tz.transition 2001, 3, :o3, 985446000
+          tz.transition 2001, 10, :o2, 1004194800
+          tz.transition 2002, 3, :o3, 1017500400
+          tz.transition 2002, 10, :o2, 1035644400
+          tz.transition 2003, 3, :o3, 1048950000
+          tz.transition 2003, 10, :o2, 1067094000
+          tz.transition 2004, 3, :o3, 1080399600
+          tz.transition 2004, 10, :o2, 1099148400
+          tz.transition 2005, 3, :o3, 1111849200
+          tz.transition 2005, 10, :o2, 1130598000
+          tz.transition 2006, 3, :o3, 1143298800
+          tz.transition 2006, 10, :o2, 1162047600
+          tz.transition 2007, 3, :o3, 1174748400
+          tz.transition 2007, 10, :o2, 1193497200
+          tz.transition 2008, 3, :o3, 1206802800
+          tz.transition 2008, 10, :o2, 1224946800
+          tz.transition 2009, 3, :o3, 1238252400
+          tz.transition 2009, 10, :o2, 1256396400
+          tz.transition 2010, 3, :o3, 1269702000
+          tz.transition 2010, 10, :o2, 1288450800
+          tz.transition 2011, 3, :o3, 1301151600
+          tz.transition 2011, 10, :o2, 1319900400
+          tz.transition 2012, 3, :o3, 1332601200
+          tz.transition 2012, 10, :o2, 1351350000
+          tz.transition 2013, 3, :o3, 1364655600
+          tz.transition 2013, 10, :o2, 1382799600
+          tz.transition 2014, 3, :o3, 1396105200
+          tz.transition 2014, 10, :o2, 1414249200
+          tz.transition 2015, 3, :o3, 1427554800
+          tz.transition 2015, 10, :o2, 1445698800
+          tz.transition 2016, 3, :o3, 1459004400
+          tz.transition 2016, 10, :o2, 1477753200
+          tz.transition 2017, 3, :o3, 1490454000
+          tz.transition 2017, 10, :o2, 1509202800
+          tz.transition 2018, 3, :o3, 1521903600
+          tz.transition 2018, 10, :o2, 1540652400
+          tz.transition 2019, 3, :o3, 1553958000
+          tz.transition 2019, 10, :o2, 1572102000
+          tz.transition 2020, 3, :o3, 1585407600
+          tz.transition 2020, 10, :o2, 1603551600
+          tz.transition 2021, 3, :o3, 1616857200
+          tz.transition 2021, 10, :o2, 1635606000
+          tz.transition 2022, 3, :o3, 1648306800
+          tz.transition 2022, 10, :o2, 1667055600
+          tz.transition 2023, 3, :o3, 1679756400
+          tz.transition 2023, 10, :o2, 1698505200
+          tz.transition 2024, 3, :o3, 1711810800
+          tz.transition 2024, 10, :o2, 1729954800
+          tz.transition 2025, 3, :o3, 1743260400
+          tz.transition 2025, 10, :o2, 1761404400
+          tz.transition 2026, 3, :o3, 1774710000
+          tz.transition 2026, 10, :o2, 1792854000
+          tz.transition 2027, 3, :o3, 1806159600
+          tz.transition 2027, 10, :o2, 1824908400
+          tz.transition 2028, 3, :o3, 1837609200
+          tz.transition 2028, 10, :o2, 1856358000
+          tz.transition 2029, 3, :o3, 1869058800
+          tz.transition 2029, 10, :o2, 1887807600
+          tz.transition 2030, 3, :o3, 1901113200
+          tz.transition 2030, 10, :o2, 1919257200
+          tz.transition 2031, 3, :o3, 1932562800
+          tz.transition 2031, 10, :o2, 1950706800
+          tz.transition 2032, 3, :o3, 1964012400
+          tz.transition 2032, 10, :o2, 1982761200
+          tz.transition 2033, 3, :o3, 1995462000
+          tz.transition 2033, 10, :o2, 2014210800
+          tz.transition 2034, 3, :o3, 2026911600
+          tz.transition 2034, 10, :o2, 2045660400
+          tz.transition 2035, 3, :o3, 2058361200
+          tz.transition 2035, 10, :o2, 2077110000
+          tz.transition 2036, 3, :o3, 2090415600
+          tz.transition 2036, 10, :o2, 2108559600
+          tz.transition 2037, 3, :o3, 2121865200
+          tz.transition 2037, 10, :o2, 2140009200
+          tz.transition 2038, 3, :o3, 19724081, 8
+          tz.transition 2038, 10, :o2, 19725817, 8
+          tz.transition 2039, 3, :o3, 19726993, 8
+          tz.transition 2039, 10, :o2, 19728729, 8
+          tz.transition 2040, 3, :o3, 19729905, 8
+          tz.transition 2040, 10, :o2, 19731641, 8
+          tz.transition 2041, 3, :o3, 19732873, 8
+          tz.transition 2041, 10, :o2, 19734553, 8
+          tz.transition 2042, 3, :o3, 19735785, 8
+          tz.transition 2042, 10, :o2, 19737465, 8
+          tz.transition 2043, 3, :o3, 19738697, 8
+          tz.transition 2043, 10, :o2, 19740377, 8
+          tz.transition 2044, 3, :o3, 19741609, 8
+          tz.transition 2044, 10, :o2, 19743345, 8
+          tz.transition 2045, 3, :o3, 19744521, 8
+          tz.transition 2045, 10, :o2, 19746257, 8
+          tz.transition 2046, 3, :o3, 19747433, 8
+          tz.transition 2046, 10, :o2, 19749169, 8
+          tz.transition 2047, 3, :o3, 19750401, 8
+          tz.transition 2047, 10, :o2, 19752081, 8
+          tz.transition 2048, 3, :o3, 19753313, 8
+          tz.transition 2048, 10, :o2, 19754993, 8
+          tz.transition 2049, 3, :o3, 19756225, 8
+          tz.transition 2049, 10, :o2, 19757961, 8
+          tz.transition 2050, 3, :o3, 19759137, 8
+          tz.transition 2050, 10, :o2, 19760873, 8
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Muscat.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Muscat.rb
new file mode 100644
index 00000000..604f651d
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Muscat.rb
@@ -0,0 +1,18 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Muscat
+        include TimezoneDefinition
+        
+        timezone 'Asia/Muscat' do |tz|
+          tz.offset :o0, 14060, 0, :LMT
+          tz.offset :o1, 14400, 0, :GST
+          
+          tz.transition 1919, 12, :o1, 10464441137, 4320
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Novosibirsk.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Novosibirsk.rb
new file mode 100644
index 00000000..a4e7796e
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Novosibirsk.rb
@@ -0,0 +1,164 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Novosibirsk
+        include TimezoneDefinition
+        
+        timezone 'Asia/Novosibirsk' do |tz|
+          tz.offset :o0, 19900, 0, :LMT
+          tz.offset :o1, 21600, 0, :NOVT
+          tz.offset :o2, 25200, 0, :NOVT
+          tz.offset :o3, 25200, 3600, :NOVST
+          tz.offset :o4, 21600, 3600, :NOVST
+          
+          tz.transition 1919, 12, :o1, 2092872833, 864
+          tz.transition 1930, 6, :o2, 9704593, 4
+          tz.transition 1981, 3, :o3, 354906000
+          tz.transition 1981, 9, :o2, 370713600
+          tz.transition 1982, 3, :o3, 386442000
+          tz.transition 1982, 9, :o2, 402249600
+          tz.transition 1983, 3, :o3, 417978000
+          tz.transition 1983, 9, :o2, 433785600
+          tz.transition 1984, 3, :o3, 449600400
+          tz.transition 1984, 9, :o2, 465332400
+          tz.transition 1985, 3, :o3, 481057200
+          tz.transition 1985, 9, :o2, 496782000
+          tz.transition 1986, 3, :o3, 512506800
+          tz.transition 1986, 9, :o2, 528231600
+          tz.transition 1987, 3, :o3, 543956400
+          tz.transition 1987, 9, :o2, 559681200
+          tz.transition 1988, 3, :o3, 575406000
+          tz.transition 1988, 9, :o2, 591130800
+          tz.transition 1989, 3, :o3, 606855600
+          tz.transition 1989, 9, :o2, 622580400
+          tz.transition 1990, 3, :o3, 638305200
+          tz.transition 1990, 9, :o2, 654634800
+          tz.transition 1991, 3, :o4, 670359600
+          tz.transition 1991, 9, :o1, 686088000
+          tz.transition 1992, 1, :o2, 695764800
+          tz.transition 1992, 3, :o3, 701798400
+          tz.transition 1992, 9, :o2, 717519600
+          tz.transition 1993, 3, :o3, 733258800
+          tz.transition 1993, 5, :o4, 738086400
+          tz.transition 1993, 9, :o1, 748987200
+          tz.transition 1994, 3, :o4, 764712000
+          tz.transition 1994, 9, :o1, 780436800
+          tz.transition 1995, 3, :o4, 796161600
+          tz.transition 1995, 9, :o1, 811886400
+          tz.transition 1996, 3, :o4, 828216000
+          tz.transition 1996, 10, :o1, 846360000
+          tz.transition 1997, 3, :o4, 859665600
+          tz.transition 1997, 10, :o1, 877809600
+          tz.transition 1998, 3, :o4, 891115200
+          tz.transition 1998, 10, :o1, 909259200
+          tz.transition 1999, 3, :o4, 922564800
+          tz.transition 1999, 10, :o1, 941313600
+          tz.transition 2000, 3, :o4, 954014400
+          tz.transition 2000, 10, :o1, 972763200
+          tz.transition 2001, 3, :o4, 985464000
+          tz.transition 2001, 10, :o1, 1004212800
+          tz.transition 2002, 3, :o4, 1017518400
+          tz.transition 2002, 10, :o1, 1035662400
+          tz.transition 2003, 3, :o4, 1048968000
+          tz.transition 2003, 10, :o1, 1067112000
+          tz.transition 2004, 3, :o4, 1080417600
+          tz.transition 2004, 10, :o1, 1099166400
+          tz.transition 2005, 3, :o4, 1111867200
+          tz.transition 2005, 10, :o1, 1130616000
+          tz.transition 2006, 3, :o4, 1143316800
+          tz.transition 2006, 10, :o1, 1162065600
+          tz.transition 2007, 3, :o4, 1174766400
+          tz.transition 2007, 10, :o1, 1193515200
+          tz.transition 2008, 3, :o4, 1206820800
+          tz.transition 2008, 10, :o1, 1224964800
+          tz.transition 2009, 3, :o4, 1238270400
+          tz.transition 2009, 10, :o1, 1256414400
+          tz.transition 2010, 3, :o4, 1269720000
+          tz.transition 2010, 10, :o1, 1288468800
+          tz.transition 2011, 3, :o4, 1301169600
+          tz.transition 2011, 10, :o1, 1319918400
+          tz.transition 2012, 3, :o4, 1332619200
+          tz.transition 2012, 10, :o1, 1351368000
+          tz.transition 2013, 3, :o4, 1364673600
+          tz.transition 2013, 10, :o1, 1382817600
+          tz.transition 2014, 3, :o4, 1396123200
+          tz.transition 2014, 10, :o1, 1414267200
+          tz.transition 2015, 3, :o4, 1427572800
+          tz.transition 2015, 10, :o1, 1445716800
+          tz.transition 2016, 3, :o4, 1459022400
+          tz.transition 2016, 10, :o1, 1477771200
+          tz.transition 2017, 3, :o4, 1490472000
+          tz.transition 2017, 10, :o1, 1509220800
+          tz.transition 2018, 3, :o4, 1521921600
+          tz.transition 2018, 10, :o1, 1540670400
+          tz.transition 2019, 3, :o4, 1553976000
+          tz.transition 2019, 10, :o1, 1572120000
+          tz.transition 2020, 3, :o4, 1585425600
+          tz.transition 2020, 10, :o1, 1603569600
+          tz.transition 2021, 3, :o4, 1616875200
+          tz.transition 2021, 10, :o1, 1635624000
+          tz.transition 2022, 3, :o4, 1648324800
+          tz.transition 2022, 10, :o1, 1667073600
+          tz.transition 2023, 3, :o4, 1679774400
+          tz.transition 2023, 10, :o1, 1698523200
+          tz.transition 2024, 3, :o4, 1711828800
+          tz.transition 2024, 10, :o1, 1729972800
+          tz.transition 2025, 3, :o4, 1743278400
+          tz.transition 2025, 10, :o1, 1761422400
+          tz.transition 2026, 3, :o4, 1774728000
+          tz.transition 2026, 10, :o1, 1792872000
+          tz.transition 2027, 3, :o4, 1806177600
+          tz.transition 2027, 10, :o1, 1824926400
+          tz.transition 2028, 3, :o4, 1837627200
+          tz.transition 2028, 10, :o1, 1856376000
+          tz.transition 2029, 3, :o4, 1869076800
+          tz.transition 2029, 10, :o1, 1887825600
+          tz.transition 2030, 3, :o4, 1901131200
+          tz.transition 2030, 10, :o1, 1919275200
+          tz.transition 2031, 3, :o4, 1932580800
+          tz.transition 2031, 10, :o1, 1950724800
+          tz.transition 2032, 3, :o4, 1964030400
+          tz.transition 2032, 10, :o1, 1982779200
+          tz.transition 2033, 3, :o4, 1995480000
+          tz.transition 2033, 10, :o1, 2014228800
+          tz.transition 2034, 3, :o4, 2026929600
+          tz.transition 2034, 10, :o1, 2045678400
+          tz.transition 2035, 3, :o4, 2058379200
+          tz.transition 2035, 10, :o1, 2077128000
+          tz.transition 2036, 3, :o4, 2090433600
+          tz.transition 2036, 10, :o1, 2108577600
+          tz.transition 2037, 3, :o4, 2121883200
+          tz.transition 2037, 10, :o1, 2140027200
+          tz.transition 2038, 3, :o4, 7396531, 3
+          tz.transition 2038, 10, :o1, 7397182, 3
+          tz.transition 2039, 3, :o4, 7397623, 3
+          tz.transition 2039, 10, :o1, 7398274, 3
+          tz.transition 2040, 3, :o4, 7398715, 3
+          tz.transition 2040, 10, :o1, 7399366, 3
+          tz.transition 2041, 3, :o4, 7399828, 3
+          tz.transition 2041, 10, :o1, 7400458, 3
+          tz.transition 2042, 3, :o4, 7400920, 3
+          tz.transition 2042, 10, :o1, 7401550, 3
+          tz.transition 2043, 3, :o4, 7402012, 3
+          tz.transition 2043, 10, :o1, 7402642, 3
+          tz.transition 2044, 3, :o4, 7403104, 3
+          tz.transition 2044, 10, :o1, 7403755, 3
+          tz.transition 2045, 3, :o4, 7404196, 3
+          tz.transition 2045, 10, :o1, 7404847, 3
+          tz.transition 2046, 3, :o4, 7405288, 3
+          tz.transition 2046, 10, :o1, 7405939, 3
+          tz.transition 2047, 3, :o4, 7406401, 3
+          tz.transition 2047, 10, :o1, 7407031, 3
+          tz.transition 2048, 3, :o4, 7407493, 3
+          tz.transition 2048, 10, :o1, 7408123, 3
+          tz.transition 2049, 3, :o4, 7408585, 3
+          tz.transition 2049, 10, :o1, 7409236, 3
+          tz.transition 2050, 3, :o4, 7409677, 3
+          tz.transition 2050, 10, :o1, 7410328, 3
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Rangoon.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Rangoon.rb
new file mode 100644
index 00000000..759b82d7
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Rangoon.rb
@@ -0,0 +1,24 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Rangoon
+        include TimezoneDefinition
+        
+        timezone 'Asia/Rangoon' do |tz|
+          tz.offset :o0, 23080, 0, :LMT
+          tz.offset :o1, 23076, 0, :RMT
+          tz.offset :o2, 23400, 0, :BURT
+          tz.offset :o3, 32400, 0, :JST
+          tz.offset :o4, 23400, 0, :MMT
+          
+          tz.transition 1879, 12, :o1, 5200664903, 2160
+          tz.transition 1919, 12, :o2, 5813578159, 2400
+          tz.transition 1942, 4, :o3, 116663051, 48
+          tz.transition 1945, 5, :o4, 19452625, 8
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Riyadh.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Riyadh.rb
new file mode 100644
index 00000000..7add4106
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Riyadh.rb
@@ -0,0 +1,18 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Riyadh
+        include TimezoneDefinition
+        
+        timezone 'Asia/Riyadh' do |tz|
+          tz.offset :o0, 11212, 0, :LMT
+          tz.offset :o1, 10800, 0, :AST
+          
+          tz.transition 1949, 12, :o1, 52558899197, 21600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Seoul.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Seoul.rb
new file mode 100644
index 00000000..795d2a75
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Seoul.rb
@@ -0,0 +1,34 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Seoul
+        include TimezoneDefinition
+        
+        timezone 'Asia/Seoul' do |tz|
+          tz.offset :o0, 30472, 0, :LMT
+          tz.offset :o1, 30600, 0, :KST
+          tz.offset :o2, 32400, 0, :KST
+          tz.offset :o3, 28800, 0, :KST
+          tz.offset :o4, 28800, 3600, :KDT
+          tz.offset :o5, 32400, 3600, :KDT
+          
+          tz.transition 1889, 12, :o1, 26042775991, 10800
+          tz.transition 1904, 11, :o2, 116007127, 48
+          tz.transition 1927, 12, :o1, 19401969, 8
+          tz.transition 1931, 12, :o2, 116481943, 48
+          tz.transition 1954, 3, :o3, 19478577, 8
+          tz.transition 1960, 5, :o4, 14622415, 6
+          tz.transition 1960, 9, :o3, 19497521, 8
+          tz.transition 1961, 8, :o1, 14625127, 6
+          tz.transition 1968, 9, :o2, 117126247, 48
+          tz.transition 1987, 5, :o5, 547570800
+          tz.transition 1987, 10, :o2, 560872800
+          tz.transition 1988, 5, :o5, 579020400
+          tz.transition 1988, 10, :o2, 592322400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Shanghai.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Shanghai.rb
new file mode 100644
index 00000000..34b13d59
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Shanghai.rb
@@ -0,0 +1,35 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Shanghai
+        include TimezoneDefinition
+        
+        timezone 'Asia/Shanghai' do |tz|
+          tz.offset :o0, 29152, 0, :LMT
+          tz.offset :o1, 28800, 0, :CST
+          tz.offset :o2, 28800, 3600, :CDT
+          
+          tz.transition 1927, 12, :o1, 6548164639, 2700
+          tz.transition 1940, 6, :o2, 14578699, 6
+          tz.transition 1940, 9, :o1, 19439225, 8
+          tz.transition 1941, 3, :o2, 14580415, 6
+          tz.transition 1941, 9, :o1, 19442145, 8
+          tz.transition 1986, 5, :o2, 515520000
+          tz.transition 1986, 9, :o1, 527007600
+          tz.transition 1987, 4, :o2, 545155200
+          tz.transition 1987, 9, :o1, 558457200
+          tz.transition 1988, 4, :o2, 576604800
+          tz.transition 1988, 9, :o1, 589906800
+          tz.transition 1989, 4, :o2, 608659200
+          tz.transition 1989, 9, :o1, 621961200
+          tz.transition 1990, 4, :o2, 640108800
+          tz.transition 1990, 9, :o1, 653410800
+          tz.transition 1991, 4, :o2, 671558400
+          tz.transition 1991, 9, :o1, 684860400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Singapore.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Singapore.rb
new file mode 100644
index 00000000..b323a78f
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Singapore.rb
@@ -0,0 +1,33 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Singapore
+        include TimezoneDefinition
+        
+        timezone 'Asia/Singapore' do |tz|
+          tz.offset :o0, 24925, 0, :LMT
+          tz.offset :o1, 24925, 0, :SMT
+          tz.offset :o2, 25200, 0, :MALT
+          tz.offset :o3, 25200, 1200, :MALST
+          tz.offset :o4, 26400, 0, :MALT
+          tz.offset :o5, 27000, 0, :MALT
+          tz.offset :o6, 32400, 0, :JST
+          tz.offset :o7, 27000, 0, :SGT
+          tz.offset :o8, 28800, 0, :SGT
+          
+          tz.transition 1900, 12, :o1, 8347571291, 3456
+          tz.transition 1905, 5, :o2, 8353142363, 3456
+          tz.transition 1932, 12, :o3, 58249757, 24
+          tz.transition 1935, 12, :o4, 87414055, 36
+          tz.transition 1941, 8, :o5, 87488575, 36
+          tz.transition 1942, 2, :o6, 38886499, 16
+          tz.transition 1945, 9, :o5, 19453681, 8
+          tz.transition 1965, 8, :o7, 39023699, 16
+          tz.transition 1981, 12, :o8, 378664200
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Taipei.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Taipei.rb
new file mode 100644
index 00000000..3ba12108
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Taipei.rb
@@ -0,0 +1,59 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Taipei
+        include TimezoneDefinition
+        
+        timezone 'Asia/Taipei' do |tz|
+          tz.offset :o0, 29160, 0, :LMT
+          tz.offset :o1, 28800, 0, :CST
+          tz.offset :o2, 28800, 3600, :CDT
+          
+          tz.transition 1895, 12, :o1, 193084733, 80
+          tz.transition 1945, 4, :o2, 14589457, 6
+          tz.transition 1945, 9, :o1, 19453833, 8
+          tz.transition 1946, 4, :o2, 14591647, 6
+          tz.transition 1946, 9, :o1, 19456753, 8
+          tz.transition 1947, 4, :o2, 14593837, 6
+          tz.transition 1947, 9, :o1, 19459673, 8
+          tz.transition 1948, 4, :o2, 14596033, 6
+          tz.transition 1948, 9, :o1, 19462601, 8
+          tz.transition 1949, 4, :o2, 14598223, 6
+          tz.transition 1949, 9, :o1, 19465521, 8
+          tz.transition 1950, 4, :o2, 14600413, 6
+          tz.transition 1950, 9, :o1, 19468441, 8
+          tz.transition 1951, 4, :o2, 14602603, 6
+          tz.transition 1951, 9, :o1, 19471361, 8
+          tz.transition 1952, 2, :o2, 14604433, 6
+          tz.transition 1952, 10, :o1, 19474537, 8
+          tz.transition 1953, 3, :o2, 14606809, 6
+          tz.transition 1953, 10, :o1, 19477457, 8
+          tz.transition 1954, 3, :o2, 14608999, 6
+          tz.transition 1954, 10, :o1, 19480377, 8
+          tz.transition 1955, 3, :o2, 14611189, 6
+          tz.transition 1955, 9, :o1, 19483049, 8
+          tz.transition 1956, 3, :o2, 14613385, 6
+          tz.transition 1956, 9, :o1, 19485977, 8
+          tz.transition 1957, 3, :o2, 14615575, 6
+          tz.transition 1957, 9, :o1, 19488897, 8
+          tz.transition 1958, 3, :o2, 14617765, 6
+          tz.transition 1958, 9, :o1, 19491817, 8
+          tz.transition 1959, 3, :o2, 14619955, 6
+          tz.transition 1959, 9, :o1, 19494737, 8
+          tz.transition 1960, 5, :o2, 14622517, 6
+          tz.transition 1960, 9, :o1, 19497665, 8
+          tz.transition 1961, 5, :o2, 14624707, 6
+          tz.transition 1961, 9, :o1, 19500585, 8
+          tz.transition 1974, 3, :o2, 133977600
+          tz.transition 1974, 9, :o1, 149785200
+          tz.transition 1975, 3, :o2, 165513600
+          tz.transition 1975, 9, :o1, 181321200
+          tz.transition 1980, 6, :o2, 331142400
+          tz.transition 1980, 9, :o1, 339087600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tashkent.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tashkent.rb
new file mode 100644
index 00000000..c205c793
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tashkent.rb
@@ -0,0 +1,47 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Tashkent
+        include TimezoneDefinition
+        
+        timezone 'Asia/Tashkent' do |tz|
+          tz.offset :o0, 16632, 0, :LMT
+          tz.offset :o1, 18000, 0, :TAST
+          tz.offset :o2, 21600, 0, :TAST
+          tz.offset :o3, 21600, 3600, :TASST
+          tz.offset :o4, 18000, 3600, :TASST
+          tz.offset :o5, 18000, 3600, :UZST
+          tz.offset :o6, 18000, 0, :UZT
+          
+          tz.transition 1924, 5, :o1, 969562923, 400
+          tz.transition 1930, 6, :o2, 58227559, 24
+          tz.transition 1981, 3, :o3, 354909600
+          tz.transition 1981, 9, :o2, 370717200
+          tz.transition 1982, 3, :o3, 386445600
+          tz.transition 1982, 9, :o2, 402253200
+          tz.transition 1983, 3, :o3, 417981600
+          tz.transition 1983, 9, :o2, 433789200
+          tz.transition 1984, 3, :o3, 449604000
+          tz.transition 1984, 9, :o2, 465336000
+          tz.transition 1985, 3, :o3, 481060800
+          tz.transition 1985, 9, :o2, 496785600
+          tz.transition 1986, 3, :o3, 512510400
+          tz.transition 1986, 9, :o2, 528235200
+          tz.transition 1987, 3, :o3, 543960000
+          tz.transition 1987, 9, :o2, 559684800
+          tz.transition 1988, 3, :o3, 575409600
+          tz.transition 1988, 9, :o2, 591134400
+          tz.transition 1989, 3, :o3, 606859200
+          tz.transition 1989, 9, :o2, 622584000
+          tz.transition 1990, 3, :o3, 638308800
+          tz.transition 1990, 9, :o2, 654638400
+          tz.transition 1991, 3, :o4, 670363200
+          tz.transition 1991, 8, :o5, 683661600
+          tz.transition 1991, 9, :o6, 686091600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tbilisi.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tbilisi.rb
new file mode 100644
index 00000000..15792a56
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tbilisi.rb
@@ -0,0 +1,78 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Tbilisi
+        include TimezoneDefinition
+        
+        timezone 'Asia/Tbilisi' do |tz|
+          tz.offset :o0, 10756, 0, :LMT
+          tz.offset :o1, 10756, 0, :TBMT
+          tz.offset :o2, 10800, 0, :TBIT
+          tz.offset :o3, 14400, 0, :TBIT
+          tz.offset :o4, 14400, 3600, :TBIST
+          tz.offset :o5, 10800, 3600, :TBIST
+          tz.offset :o6, 10800, 3600, :GEST
+          tz.offset :o7, 10800, 0, :GET
+          tz.offset :o8, 14400, 0, :GET
+          tz.offset :o9, 14400, 3600, :GEST
+          
+          tz.transition 1879, 12, :o1, 52006652111, 21600
+          tz.transition 1924, 5, :o2, 52356399311, 21600
+          tz.transition 1957, 2, :o3, 19487187, 8
+          tz.transition 1981, 3, :o4, 354916800
+          tz.transition 1981, 9, :o3, 370724400
+          tz.transition 1982, 3, :o4, 386452800
+          tz.transition 1982, 9, :o3, 402260400
+          tz.transition 1983, 3, :o4, 417988800
+          tz.transition 1983, 9, :o3, 433796400
+          tz.transition 1984, 3, :o4, 449611200
+          tz.transition 1984, 9, :o3, 465343200
+          tz.transition 1985, 3, :o4, 481068000
+          tz.transition 1985, 9, :o3, 496792800
+          tz.transition 1986, 3, :o4, 512517600
+          tz.transition 1986, 9, :o3, 528242400
+          tz.transition 1987, 3, :o4, 543967200
+          tz.transition 1987, 9, :o3, 559692000
+          tz.transition 1988, 3, :o4, 575416800
+          tz.transition 1988, 9, :o3, 591141600
+          tz.transition 1989, 3, :o4, 606866400
+          tz.transition 1989, 9, :o3, 622591200
+          tz.transition 1990, 3, :o4, 638316000
+          tz.transition 1990, 9, :o3, 654645600
+          tz.transition 1991, 3, :o5, 670370400
+          tz.transition 1991, 4, :o6, 671140800
+          tz.transition 1991, 9, :o7, 686098800
+          tz.transition 1992, 3, :o6, 701816400
+          tz.transition 1992, 9, :o7, 717537600
+          tz.transition 1993, 3, :o6, 733266000
+          tz.transition 1993, 9, :o7, 748987200
+          tz.transition 1994, 3, :o6, 764715600
+          tz.transition 1994, 9, :o8, 780436800
+          tz.transition 1995, 3, :o9, 796161600
+          tz.transition 1995, 9, :o8, 811882800
+          tz.transition 1996, 3, :o9, 828216000
+          tz.transition 1997, 3, :o9, 859662000
+          tz.transition 1997, 10, :o8, 877806000
+          tz.transition 1998, 3, :o9, 891115200
+          tz.transition 1998, 10, :o8, 909255600
+          tz.transition 1999, 3, :o9, 922564800
+          tz.transition 1999, 10, :o8, 941310000
+          tz.transition 2000, 3, :o9, 954014400
+          tz.transition 2000, 10, :o8, 972759600
+          tz.transition 2001, 3, :o9, 985464000
+          tz.transition 2001, 10, :o8, 1004209200
+          tz.transition 2002, 3, :o9, 1017518400
+          tz.transition 2002, 10, :o8, 1035658800
+          tz.transition 2003, 3, :o9, 1048968000
+          tz.transition 2003, 10, :o8, 1067108400
+          tz.transition 2004, 3, :o9, 1080417600
+          tz.transition 2004, 6, :o6, 1088276400
+          tz.transition 2004, 10, :o7, 1099177200
+          tz.transition 2005, 3, :o8, 1111878000
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tehran.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tehran.rb
new file mode 100644
index 00000000..d8df964a
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tehran.rb
@@ -0,0 +1,121 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Tehran
+        include TimezoneDefinition
+        
+        timezone 'Asia/Tehran' do |tz|
+          tz.offset :o0, 12344, 0, :LMT
+          tz.offset :o1, 12344, 0, :TMT
+          tz.offset :o2, 12600, 0, :IRST
+          tz.offset :o3, 14400, 0, :IRST
+          tz.offset :o4, 14400, 3600, :IRDT
+          tz.offset :o5, 12600, 3600, :IRDT
+          
+          tz.transition 1915, 12, :o1, 26145324257, 10800
+          tz.transition 1945, 12, :o2, 26263670657, 10800
+          tz.transition 1977, 10, :o3, 247177800
+          tz.transition 1978, 3, :o4, 259272000
+          tz.transition 1978, 10, :o3, 277758000
+          tz.transition 1978, 12, :o2, 283982400
+          tz.transition 1979, 3, :o5, 290809800
+          tz.transition 1979, 9, :o2, 306531000
+          tz.transition 1980, 3, :o5, 322432200
+          tz.transition 1980, 9, :o2, 338499000
+          tz.transition 1991, 5, :o5, 673216200
+          tz.transition 1991, 9, :o2, 685481400
+          tz.transition 1992, 3, :o5, 701209800
+          tz.transition 1992, 9, :o2, 717103800
+          tz.transition 1993, 3, :o5, 732745800
+          tz.transition 1993, 9, :o2, 748639800
+          tz.transition 1994, 3, :o5, 764281800
+          tz.transition 1994, 9, :o2, 780175800
+          tz.transition 1995, 3, :o5, 795817800
+          tz.transition 1995, 9, :o2, 811711800
+          tz.transition 1996, 3, :o5, 827353800
+          tz.transition 1996, 9, :o2, 843247800
+          tz.transition 1997, 3, :o5, 858976200
+          tz.transition 1997, 9, :o2, 874870200
+          tz.transition 1998, 3, :o5, 890512200
+          tz.transition 1998, 9, :o2, 906406200
+          tz.transition 1999, 3, :o5, 922048200
+          tz.transition 1999, 9, :o2, 937942200
+          tz.transition 2000, 3, :o5, 953584200
+          tz.transition 2000, 9, :o2, 969478200
+          tz.transition 2001, 3, :o5, 985206600
+          tz.transition 2001, 9, :o2, 1001100600
+          tz.transition 2002, 3, :o5, 1016742600
+          tz.transition 2002, 9, :o2, 1032636600
+          tz.transition 2003, 3, :o5, 1048278600
+          tz.transition 2003, 9, :o2, 1064172600
+          tz.transition 2004, 3, :o5, 1079814600
+          tz.transition 2004, 9, :o2, 1095708600
+          tz.transition 2005, 3, :o5, 1111437000
+          tz.transition 2005, 9, :o2, 1127331000
+          tz.transition 2008, 3, :o5, 1206045000
+          tz.transition 2008, 9, :o2, 1221939000
+          tz.transition 2009, 3, :o5, 1237667400
+          tz.transition 2009, 9, :o2, 1253561400
+          tz.transition 2010, 3, :o5, 1269203400
+          tz.transition 2010, 9, :o2, 1285097400
+          tz.transition 2011, 3, :o5, 1300739400
+          tz.transition 2011, 9, :o2, 1316633400
+          tz.transition 2012, 3, :o5, 1332275400
+          tz.transition 2012, 9, :o2, 1348169400
+          tz.transition 2013, 3, :o5, 1363897800
+          tz.transition 2013, 9, :o2, 1379791800
+          tz.transition 2014, 3, :o5, 1395433800
+          tz.transition 2014, 9, :o2, 1411327800
+          tz.transition 2015, 3, :o5, 1426969800
+          tz.transition 2015, 9, :o2, 1442863800
+          tz.transition 2016, 3, :o5, 1458505800
+          tz.transition 2016, 9, :o2, 1474399800
+          tz.transition 2017, 3, :o5, 1490128200
+          tz.transition 2017, 9, :o2, 1506022200
+          tz.transition 2018, 3, :o5, 1521664200
+          tz.transition 2018, 9, :o2, 1537558200
+          tz.transition 2019, 3, :o5, 1553200200
+          tz.transition 2019, 9, :o2, 1569094200
+          tz.transition 2020, 3, :o5, 1584736200
+          tz.transition 2020, 9, :o2, 1600630200
+          tz.transition 2021, 3, :o5, 1616358600
+          tz.transition 2021, 9, :o2, 1632252600
+          tz.transition 2022, 3, :o5, 1647894600
+          tz.transition 2022, 9, :o2, 1663788600
+          tz.transition 2023, 3, :o5, 1679430600
+          tz.transition 2023, 9, :o2, 1695324600
+          tz.transition 2024, 3, :o5, 1710966600
+          tz.transition 2024, 9, :o2, 1726860600
+          tz.transition 2025, 3, :o5, 1742589000
+          tz.transition 2025, 9, :o2, 1758483000
+          tz.transition 2026, 3, :o5, 1774125000
+          tz.transition 2026, 9, :o2, 1790019000
+          tz.transition 2027, 3, :o5, 1805661000
+          tz.transition 2027, 9, :o2, 1821555000
+          tz.transition 2028, 3, :o5, 1837197000
+          tz.transition 2028, 9, :o2, 1853091000
+          tz.transition 2029, 3, :o5, 1868733000
+          tz.transition 2029, 9, :o2, 1884627000
+          tz.transition 2030, 3, :o5, 1900355400
+          tz.transition 2030, 9, :o2, 1916249400
+          tz.transition 2031, 3, :o5, 1931891400
+          tz.transition 2031, 9, :o2, 1947785400
+          tz.transition 2032, 3, :o5, 1963427400
+          tz.transition 2032, 9, :o2, 1979321400
+          tz.transition 2033, 3, :o5, 1994963400
+          tz.transition 2033, 9, :o2, 2010857400
+          tz.transition 2034, 3, :o5, 2026585800
+          tz.transition 2034, 9, :o2, 2042479800
+          tz.transition 2035, 3, :o5, 2058121800
+          tz.transition 2035, 9, :o2, 2074015800
+          tz.transition 2036, 3, :o5, 2089657800
+          tz.transition 2036, 9, :o2, 2105551800
+          tz.transition 2037, 3, :o5, 2121193800
+          tz.transition 2037, 9, :o2, 2137087800
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tokyo.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tokyo.rb
new file mode 100644
index 00000000..51c9e164
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tokyo.rb
@@ -0,0 +1,30 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Tokyo
+        include TimezoneDefinition
+        
+        timezone 'Asia/Tokyo' do |tz|
+          tz.offset :o0, 33539, 0, :LMT
+          tz.offset :o1, 32400, 0, :JST
+          tz.offset :o2, 32400, 0, :CJT
+          tz.offset :o3, 32400, 3600, :JDT
+          
+          tz.transition 1887, 12, :o1, 19285097, 8
+          tz.transition 1895, 12, :o2, 19308473, 8
+          tz.transition 1937, 12, :o1, 19431193, 8
+          tz.transition 1948, 5, :o3, 58384157, 24
+          tz.transition 1948, 9, :o1, 14596831, 6
+          tz.transition 1949, 4, :o3, 58392221, 24
+          tz.transition 1949, 9, :o1, 14599015, 6
+          tz.transition 1950, 5, :o3, 58401797, 24
+          tz.transition 1950, 9, :o1, 14601199, 6
+          tz.transition 1951, 5, :o3, 58410533, 24
+          tz.transition 1951, 9, :o1, 14603383, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Ulaanbaatar.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Ulaanbaatar.rb
new file mode 100644
index 00000000..2854f5c5
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Ulaanbaatar.rb
@@ -0,0 +1,65 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Ulaanbaatar
+        include TimezoneDefinition
+        
+        timezone 'Asia/Ulaanbaatar' do |tz|
+          tz.offset :o0, 25652, 0, :LMT
+          tz.offset :o1, 25200, 0, :ULAT
+          tz.offset :o2, 28800, 0, :ULAT
+          tz.offset :o3, 28800, 3600, :ULAST
+          
+          tz.transition 1905, 7, :o1, 52208457187, 21600
+          tz.transition 1977, 12, :o2, 252435600
+          tz.transition 1983, 3, :o3, 417974400
+          tz.transition 1983, 9, :o2, 433782000
+          tz.transition 1984, 3, :o3, 449596800
+          tz.transition 1984, 9, :o2, 465318000
+          tz.transition 1985, 3, :o3, 481046400
+          tz.transition 1985, 9, :o2, 496767600
+          tz.transition 1986, 3, :o3, 512496000
+          tz.transition 1986, 9, :o2, 528217200
+          tz.transition 1987, 3, :o3, 543945600
+          tz.transition 1987, 9, :o2, 559666800
+          tz.transition 1988, 3, :o3, 575395200
+          tz.transition 1988, 9, :o2, 591116400
+          tz.transition 1989, 3, :o3, 606844800
+          tz.transition 1989, 9, :o2, 622566000
+          tz.transition 1990, 3, :o3, 638294400
+          tz.transition 1990, 9, :o2, 654620400
+          tz.transition 1991, 3, :o3, 670348800
+          tz.transition 1991, 9, :o2, 686070000
+          tz.transition 1992, 3, :o3, 701798400
+          tz.transition 1992, 9, :o2, 717519600
+          tz.transition 1993, 3, :o3, 733248000
+          tz.transition 1993, 9, :o2, 748969200
+          tz.transition 1994, 3, :o3, 764697600
+          tz.transition 1994, 9, :o2, 780418800
+          tz.transition 1995, 3, :o3, 796147200
+          tz.transition 1995, 9, :o2, 811868400
+          tz.transition 1996, 3, :o3, 828201600
+          tz.transition 1996, 9, :o2, 843922800
+          tz.transition 1997, 3, :o3, 859651200
+          tz.transition 1997, 9, :o2, 875372400
+          tz.transition 1998, 3, :o3, 891100800
+          tz.transition 1998, 9, :o2, 906822000
+          tz.transition 2001, 4, :o3, 988394400
+          tz.transition 2001, 9, :o2, 1001696400
+          tz.transition 2002, 3, :o3, 1017424800
+          tz.transition 2002, 9, :o2, 1033146000
+          tz.transition 2003, 3, :o3, 1048874400
+          tz.transition 2003, 9, :o2, 1064595600
+          tz.transition 2004, 3, :o3, 1080324000
+          tz.transition 2004, 9, :o2, 1096045200
+          tz.transition 2005, 3, :o3, 1111773600
+          tz.transition 2005, 9, :o2, 1127494800
+          tz.transition 2006, 3, :o3, 1143223200
+          tz.transition 2006, 9, :o2, 1159549200
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Urumqi.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Urumqi.rb
new file mode 100644
index 00000000..d793ff13
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Urumqi.rb
@@ -0,0 +1,33 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Urumqi
+        include TimezoneDefinition
+        
+        timezone 'Asia/Urumqi' do |tz|
+          tz.offset :o0, 21020, 0, :LMT
+          tz.offset :o1, 21600, 0, :URUT
+          tz.offset :o2, 28800, 0, :CST
+          tz.offset :o3, 28800, 3600, :CDT
+          
+          tz.transition 1927, 12, :o1, 10477063829, 4320
+          tz.transition 1980, 4, :o2, 325965600
+          tz.transition 1986, 5, :o3, 515520000
+          tz.transition 1986, 9, :o2, 527007600
+          tz.transition 1987, 4, :o3, 545155200
+          tz.transition 1987, 9, :o2, 558457200
+          tz.transition 1988, 4, :o3, 576604800
+          tz.transition 1988, 9, :o2, 589906800
+          tz.transition 1989, 4, :o3, 608659200
+          tz.transition 1989, 9, :o2, 621961200
+          tz.transition 1990, 4, :o3, 640108800
+          tz.transition 1990, 9, :o2, 653410800
+          tz.transition 1991, 4, :o3, 671558400
+          tz.transition 1991, 9, :o2, 684860400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Vladivostok.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Vladivostok.rb
new file mode 100644
index 00000000..bd9e3d60
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Vladivostok.rb
@@ -0,0 +1,164 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Vladivostok
+        include TimezoneDefinition
+        
+        timezone 'Asia/Vladivostok' do |tz|
+          tz.offset :o0, 31664, 0, :LMT
+          tz.offset :o1, 32400, 0, :VLAT
+          tz.offset :o2, 36000, 0, :VLAT
+          tz.offset :o3, 36000, 3600, :VLAST
+          tz.offset :o4, 32400, 3600, :VLASST
+          tz.offset :o5, 32400, 0, :VLAST
+          
+          tz.transition 1922, 11, :o1, 13086214921, 5400
+          tz.transition 1930, 6, :o2, 19409185, 8
+          tz.transition 1981, 3, :o3, 354895200
+          tz.transition 1981, 9, :o2, 370702800
+          tz.transition 1982, 3, :o3, 386431200
+          tz.transition 1982, 9, :o2, 402238800
+          tz.transition 1983, 3, :o3, 417967200
+          tz.transition 1983, 9, :o2, 433774800
+          tz.transition 1984, 3, :o3, 449589600
+          tz.transition 1984, 9, :o2, 465321600
+          tz.transition 1985, 3, :o3, 481046400
+          tz.transition 1985, 9, :o2, 496771200
+          tz.transition 1986, 3, :o3, 512496000
+          tz.transition 1986, 9, :o2, 528220800
+          tz.transition 1987, 3, :o3, 543945600
+          tz.transition 1987, 9, :o2, 559670400
+          tz.transition 1988, 3, :o3, 575395200
+          tz.transition 1988, 9, :o2, 591120000
+          tz.transition 1989, 3, :o3, 606844800
+          tz.transition 1989, 9, :o2, 622569600
+          tz.transition 1990, 3, :o3, 638294400
+          tz.transition 1990, 9, :o2, 654624000
+          tz.transition 1991, 3, :o4, 670348800
+          tz.transition 1991, 9, :o5, 686077200
+          tz.transition 1992, 1, :o2, 695754000
+          tz.transition 1992, 3, :o3, 701787600
+          tz.transition 1992, 9, :o2, 717508800
+          tz.transition 1993, 3, :o3, 733248000
+          tz.transition 1993, 9, :o2, 748972800
+          tz.transition 1994, 3, :o3, 764697600
+          tz.transition 1994, 9, :o2, 780422400
+          tz.transition 1995, 3, :o3, 796147200
+          tz.transition 1995, 9, :o2, 811872000
+          tz.transition 1996, 3, :o3, 828201600
+          tz.transition 1996, 10, :o2, 846345600
+          tz.transition 1997, 3, :o3, 859651200
+          tz.transition 1997, 10, :o2, 877795200
+          tz.transition 1998, 3, :o3, 891100800
+          tz.transition 1998, 10, :o2, 909244800
+          tz.transition 1999, 3, :o3, 922550400
+          tz.transition 1999, 10, :o2, 941299200
+          tz.transition 2000, 3, :o3, 954000000
+          tz.transition 2000, 10, :o2, 972748800
+          tz.transition 2001, 3, :o3, 985449600
+          tz.transition 2001, 10, :o2, 1004198400
+          tz.transition 2002, 3, :o3, 1017504000
+          tz.transition 2002, 10, :o2, 1035648000
+          tz.transition 2003, 3, :o3, 1048953600
+          tz.transition 2003, 10, :o2, 1067097600
+          tz.transition 2004, 3, :o3, 1080403200
+          tz.transition 2004, 10, :o2, 1099152000
+          tz.transition 2005, 3, :o3, 1111852800
+          tz.transition 2005, 10, :o2, 1130601600
+          tz.transition 2006, 3, :o3, 1143302400
+          tz.transition 2006, 10, :o2, 1162051200
+          tz.transition 2007, 3, :o3, 1174752000
+          tz.transition 2007, 10, :o2, 1193500800
+          tz.transition 2008, 3, :o3, 1206806400
+          tz.transition 2008, 10, :o2, 1224950400
+          tz.transition 2009, 3, :o3, 1238256000
+          tz.transition 2009, 10, :o2, 1256400000
+          tz.transition 2010, 3, :o3, 1269705600
+          tz.transition 2010, 10, :o2, 1288454400
+          tz.transition 2011, 3, :o3, 1301155200
+          tz.transition 2011, 10, :o2, 1319904000
+          tz.transition 2012, 3, :o3, 1332604800
+          tz.transition 2012, 10, :o2, 1351353600
+          tz.transition 2013, 3, :o3, 1364659200
+          tz.transition 2013, 10, :o2, 1382803200
+          tz.transition 2014, 3, :o3, 1396108800
+          tz.transition 2014, 10, :o2, 1414252800
+          tz.transition 2015, 3, :o3, 1427558400
+          tz.transition 2015, 10, :o2, 1445702400
+          tz.transition 2016, 3, :o3, 1459008000
+          tz.transition 2016, 10, :o2, 1477756800
+          tz.transition 2017, 3, :o3, 1490457600
+          tz.transition 2017, 10, :o2, 1509206400
+          tz.transition 2018, 3, :o3, 1521907200
+          tz.transition 2018, 10, :o2, 1540656000
+          tz.transition 2019, 3, :o3, 1553961600
+          tz.transition 2019, 10, :o2, 1572105600
+          tz.transition 2020, 3, :o3, 1585411200
+          tz.transition 2020, 10, :o2, 1603555200
+          tz.transition 2021, 3, :o3, 1616860800
+          tz.transition 2021, 10, :o2, 1635609600
+          tz.transition 2022, 3, :o3, 1648310400
+          tz.transition 2022, 10, :o2, 1667059200
+          tz.transition 2023, 3, :o3, 1679760000
+          tz.transition 2023, 10, :o2, 1698508800
+          tz.transition 2024, 3, :o3, 1711814400
+          tz.transition 2024, 10, :o2, 1729958400
+          tz.transition 2025, 3, :o3, 1743264000
+          tz.transition 2025, 10, :o2, 1761408000
+          tz.transition 2026, 3, :o3, 1774713600
+          tz.transition 2026, 10, :o2, 1792857600
+          tz.transition 2027, 3, :o3, 1806163200
+          tz.transition 2027, 10, :o2, 1824912000
+          tz.transition 2028, 3, :o3, 1837612800
+          tz.transition 2028, 10, :o2, 1856361600
+          tz.transition 2029, 3, :o3, 1869062400
+          tz.transition 2029, 10, :o2, 1887811200
+          tz.transition 2030, 3, :o3, 1901116800
+          tz.transition 2030, 10, :o2, 1919260800
+          tz.transition 2031, 3, :o3, 1932566400
+          tz.transition 2031, 10, :o2, 1950710400
+          tz.transition 2032, 3, :o3, 1964016000
+          tz.transition 2032, 10, :o2, 1982764800
+          tz.transition 2033, 3, :o3, 1995465600
+          tz.transition 2033, 10, :o2, 2014214400
+          tz.transition 2034, 3, :o3, 2026915200
+          tz.transition 2034, 10, :o2, 2045664000
+          tz.transition 2035, 3, :o3, 2058364800
+          tz.transition 2035, 10, :o2, 2077113600
+          tz.transition 2036, 3, :o3, 2090419200
+          tz.transition 2036, 10, :o2, 2108563200
+          tz.transition 2037, 3, :o3, 2121868800
+          tz.transition 2037, 10, :o2, 2140012800
+          tz.transition 2038, 3, :o3, 14793061, 6
+          tz.transition 2038, 10, :o2, 14794363, 6
+          tz.transition 2039, 3, :o3, 14795245, 6
+          tz.transition 2039, 10, :o2, 14796547, 6
+          tz.transition 2040, 3, :o3, 14797429, 6
+          tz.transition 2040, 10, :o2, 14798731, 6
+          tz.transition 2041, 3, :o3, 14799655, 6
+          tz.transition 2041, 10, :o2, 14800915, 6
+          tz.transition 2042, 3, :o3, 14801839, 6
+          tz.transition 2042, 10, :o2, 14803099, 6
+          tz.transition 2043, 3, :o3, 14804023, 6
+          tz.transition 2043, 10, :o2, 14805283, 6
+          tz.transition 2044, 3, :o3, 14806207, 6
+          tz.transition 2044, 10, :o2, 14807509, 6
+          tz.transition 2045, 3, :o3, 14808391, 6
+          tz.transition 2045, 10, :o2, 14809693, 6
+          tz.transition 2046, 3, :o3, 14810575, 6
+          tz.transition 2046, 10, :o2, 14811877, 6
+          tz.transition 2047, 3, :o3, 14812801, 6
+          tz.transition 2047, 10, :o2, 14814061, 6
+          tz.transition 2048, 3, :o3, 14814985, 6
+          tz.transition 2048, 10, :o2, 14816245, 6
+          tz.transition 2049, 3, :o3, 14817169, 6
+          tz.transition 2049, 10, :o2, 14818471, 6
+          tz.transition 2050, 3, :o3, 14819353, 6
+          tz.transition 2050, 10, :o2, 14820655, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yakutsk.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yakutsk.rb
new file mode 100644
index 00000000..56435a78
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yakutsk.rb
@@ -0,0 +1,163 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Yakutsk
+        include TimezoneDefinition
+        
+        timezone 'Asia/Yakutsk' do |tz|
+          tz.offset :o0, 31120, 0, :LMT
+          tz.offset :o1, 28800, 0, :YAKT
+          tz.offset :o2, 32400, 0, :YAKT
+          tz.offset :o3, 32400, 3600, :YAKST
+          tz.offset :o4, 28800, 3600, :YAKST
+          
+          tz.transition 1919, 12, :o1, 2616091711, 1080
+          tz.transition 1930, 6, :o2, 14556889, 6
+          tz.transition 1981, 3, :o3, 354898800
+          tz.transition 1981, 9, :o2, 370706400
+          tz.transition 1982, 3, :o3, 386434800
+          tz.transition 1982, 9, :o2, 402242400
+          tz.transition 1983, 3, :o3, 417970800
+          tz.transition 1983, 9, :o2, 433778400
+          tz.transition 1984, 3, :o3, 449593200
+          tz.transition 1984, 9, :o2, 465325200
+          tz.transition 1985, 3, :o3, 481050000
+          tz.transition 1985, 9, :o2, 496774800
+          tz.transition 1986, 3, :o3, 512499600
+          tz.transition 1986, 9, :o2, 528224400
+          tz.transition 1987, 3, :o3, 543949200
+          tz.transition 1987, 9, :o2, 559674000
+          tz.transition 1988, 3, :o3, 575398800
+          tz.transition 1988, 9, :o2, 591123600
+          tz.transition 1989, 3, :o3, 606848400
+          tz.transition 1989, 9, :o2, 622573200
+          tz.transition 1990, 3, :o3, 638298000
+          tz.transition 1990, 9, :o2, 654627600
+          tz.transition 1991, 3, :o4, 670352400
+          tz.transition 1991, 9, :o1, 686080800
+          tz.transition 1992, 1, :o2, 695757600
+          tz.transition 1992, 3, :o3, 701791200
+          tz.transition 1992, 9, :o2, 717512400
+          tz.transition 1993, 3, :o3, 733251600
+          tz.transition 1993, 9, :o2, 748976400
+          tz.transition 1994, 3, :o3, 764701200
+          tz.transition 1994, 9, :o2, 780426000
+          tz.transition 1995, 3, :o3, 796150800
+          tz.transition 1995, 9, :o2, 811875600
+          tz.transition 1996, 3, :o3, 828205200
+          tz.transition 1996, 10, :o2, 846349200
+          tz.transition 1997, 3, :o3, 859654800
+          tz.transition 1997, 10, :o2, 877798800
+          tz.transition 1998, 3, :o3, 891104400
+          tz.transition 1998, 10, :o2, 909248400
+          tz.transition 1999, 3, :o3, 922554000
+          tz.transition 1999, 10, :o2, 941302800
+          tz.transition 2000, 3, :o3, 954003600
+          tz.transition 2000, 10, :o2, 972752400
+          tz.transition 2001, 3, :o3, 985453200
+          tz.transition 2001, 10, :o2, 1004202000
+          tz.transition 2002, 3, :o3, 1017507600
+          tz.transition 2002, 10, :o2, 1035651600
+          tz.transition 2003, 3, :o3, 1048957200
+          tz.transition 2003, 10, :o2, 1067101200
+          tz.transition 2004, 3, :o3, 1080406800
+          tz.transition 2004, 10, :o2, 1099155600
+          tz.transition 2005, 3, :o3, 1111856400
+          tz.transition 2005, 10, :o2, 1130605200
+          tz.transition 2006, 3, :o3, 1143306000
+          tz.transition 2006, 10, :o2, 1162054800
+          tz.transition 2007, 3, :o3, 1174755600
+          tz.transition 2007, 10, :o2, 1193504400
+          tz.transition 2008, 3, :o3, 1206810000
+          tz.transition 2008, 10, :o2, 1224954000
+          tz.transition 2009, 3, :o3, 1238259600
+          tz.transition 2009, 10, :o2, 1256403600
+          tz.transition 2010, 3, :o3, 1269709200
+          tz.transition 2010, 10, :o2, 1288458000
+          tz.transition 2011, 3, :o3, 1301158800
+          tz.transition 2011, 10, :o2, 1319907600
+          tz.transition 2012, 3, :o3, 1332608400
+          tz.transition 2012, 10, :o2, 1351357200
+          tz.transition 2013, 3, :o3, 1364662800
+          tz.transition 2013, 10, :o2, 1382806800
+          tz.transition 2014, 3, :o3, 1396112400
+          tz.transition 2014, 10, :o2, 1414256400
+          tz.transition 2015, 3, :o3, 1427562000
+          tz.transition 2015, 10, :o2, 1445706000
+          tz.transition 2016, 3, :o3, 1459011600
+          tz.transition 2016, 10, :o2, 1477760400
+          tz.transition 2017, 3, :o3, 1490461200
+          tz.transition 2017, 10, :o2, 1509210000
+          tz.transition 2018, 3, :o3, 1521910800
+          tz.transition 2018, 10, :o2, 1540659600
+          tz.transition 2019, 3, :o3, 1553965200
+          tz.transition 2019, 10, :o2, 1572109200
+          tz.transition 2020, 3, :o3, 1585414800
+          tz.transition 2020, 10, :o2, 1603558800
+          tz.transition 2021, 3, :o3, 1616864400
+          tz.transition 2021, 10, :o2, 1635613200
+          tz.transition 2022, 3, :o3, 1648314000
+          tz.transition 2022, 10, :o2, 1667062800
+          tz.transition 2023, 3, :o3, 1679763600
+          tz.transition 2023, 10, :o2, 1698512400
+          tz.transition 2024, 3, :o3, 1711818000
+          tz.transition 2024, 10, :o2, 1729962000
+          tz.transition 2025, 3, :o3, 1743267600
+          tz.transition 2025, 10, :o2, 1761411600
+          tz.transition 2026, 3, :o3, 1774717200
+          tz.transition 2026, 10, :o2, 1792861200
+          tz.transition 2027, 3, :o3, 1806166800
+          tz.transition 2027, 10, :o2, 1824915600
+          tz.transition 2028, 3, :o3, 1837616400
+          tz.transition 2028, 10, :o2, 1856365200
+          tz.transition 2029, 3, :o3, 1869066000
+          tz.transition 2029, 10, :o2, 1887814800
+          tz.transition 2030, 3, :o3, 1901120400
+          tz.transition 2030, 10, :o2, 1919264400
+          tz.transition 2031, 3, :o3, 1932570000
+          tz.transition 2031, 10, :o2, 1950714000
+          tz.transition 2032, 3, :o3, 1964019600
+          tz.transition 2032, 10, :o2, 1982768400
+          tz.transition 2033, 3, :o3, 1995469200
+          tz.transition 2033, 10, :o2, 2014218000
+          tz.transition 2034, 3, :o3, 2026918800
+          tz.transition 2034, 10, :o2, 2045667600
+          tz.transition 2035, 3, :o3, 2058368400
+          tz.transition 2035, 10, :o2, 2077117200
+          tz.transition 2036, 3, :o3, 2090422800
+          tz.transition 2036, 10, :o2, 2108566800
+          tz.transition 2037, 3, :o3, 2121872400
+          tz.transition 2037, 10, :o2, 2140016400
+          tz.transition 2038, 3, :o3, 59172245, 24
+          tz.transition 2038, 10, :o2, 59177453, 24
+          tz.transition 2039, 3, :o3, 59180981, 24
+          tz.transition 2039, 10, :o2, 59186189, 24
+          tz.transition 2040, 3, :o3, 59189717, 24
+          tz.transition 2040, 10, :o2, 59194925, 24
+          tz.transition 2041, 3, :o3, 59198621, 24
+          tz.transition 2041, 10, :o2, 59203661, 24
+          tz.transition 2042, 3, :o3, 59207357, 24
+          tz.transition 2042, 10, :o2, 59212397, 24
+          tz.transition 2043, 3, :o3, 59216093, 24
+          tz.transition 2043, 10, :o2, 59221133, 24
+          tz.transition 2044, 3, :o3, 59224829, 24
+          tz.transition 2044, 10, :o2, 59230037, 24
+          tz.transition 2045, 3, :o3, 59233565, 24
+          tz.transition 2045, 10, :o2, 59238773, 24
+          tz.transition 2046, 3, :o3, 59242301, 24
+          tz.transition 2046, 10, :o2, 59247509, 24
+          tz.transition 2047, 3, :o3, 59251205, 24
+          tz.transition 2047, 10, :o2, 59256245, 24
+          tz.transition 2048, 3, :o3, 59259941, 24
+          tz.transition 2048, 10, :o2, 59264981, 24
+          tz.transition 2049, 3, :o3, 59268677, 24
+          tz.transition 2049, 10, :o2, 59273885, 24
+          tz.transition 2050, 3, :o3, 59277413, 24
+          tz.transition 2050, 10, :o2, 59282621, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yekaterinburg.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yekaterinburg.rb
new file mode 100644
index 00000000..8ef8df4a
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yekaterinburg.rb
@@ -0,0 +1,165 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Yekaterinburg
+        include TimezoneDefinition
+        
+        timezone 'Asia/Yekaterinburg' do |tz|
+          tz.offset :o0, 14544, 0, :LMT
+          tz.offset :o1, 14400, 0, :SVET
+          tz.offset :o2, 18000, 0, :SVET
+          tz.offset :o3, 18000, 3600, :SVEST
+          tz.offset :o4, 14400, 3600, :SVEST
+          tz.offset :o5, 18000, 0, :YEKT
+          tz.offset :o6, 18000, 3600, :YEKST
+          
+          tz.transition 1919, 7, :o1, 1453292699, 600
+          tz.transition 1930, 6, :o2, 7278445, 3
+          tz.transition 1981, 3, :o3, 354913200
+          tz.transition 1981, 9, :o2, 370720800
+          tz.transition 1982, 3, :o3, 386449200
+          tz.transition 1982, 9, :o2, 402256800
+          tz.transition 1983, 3, :o3, 417985200
+          tz.transition 1983, 9, :o2, 433792800
+          tz.transition 1984, 3, :o3, 449607600
+          tz.transition 1984, 9, :o2, 465339600
+          tz.transition 1985, 3, :o3, 481064400
+          tz.transition 1985, 9, :o2, 496789200
+          tz.transition 1986, 3, :o3, 512514000
+          tz.transition 1986, 9, :o2, 528238800
+          tz.transition 1987, 3, :o3, 543963600
+          tz.transition 1987, 9, :o2, 559688400
+          tz.transition 1988, 3, :o3, 575413200
+          tz.transition 1988, 9, :o2, 591138000
+          tz.transition 1989, 3, :o3, 606862800
+          tz.transition 1989, 9, :o2, 622587600
+          tz.transition 1990, 3, :o3, 638312400
+          tz.transition 1990, 9, :o2, 654642000
+          tz.transition 1991, 3, :o4, 670366800
+          tz.transition 1991, 9, :o1, 686095200
+          tz.transition 1992, 1, :o5, 695772000
+          tz.transition 1992, 3, :o6, 701805600
+          tz.transition 1992, 9, :o5, 717526800
+          tz.transition 1993, 3, :o6, 733266000
+          tz.transition 1993, 9, :o5, 748990800
+          tz.transition 1994, 3, :o6, 764715600
+          tz.transition 1994, 9, :o5, 780440400
+          tz.transition 1995, 3, :o6, 796165200
+          tz.transition 1995, 9, :o5, 811890000
+          tz.transition 1996, 3, :o6, 828219600
+          tz.transition 1996, 10, :o5, 846363600
+          tz.transition 1997, 3, :o6, 859669200
+          tz.transition 1997, 10, :o5, 877813200
+          tz.transition 1998, 3, :o6, 891118800
+          tz.transition 1998, 10, :o5, 909262800
+          tz.transition 1999, 3, :o6, 922568400
+          tz.transition 1999, 10, :o5, 941317200
+          tz.transition 2000, 3, :o6, 954018000
+          tz.transition 2000, 10, :o5, 972766800
+          tz.transition 2001, 3, :o6, 985467600
+          tz.transition 2001, 10, :o5, 1004216400
+          tz.transition 2002, 3, :o6, 1017522000
+          tz.transition 2002, 10, :o5, 1035666000
+          tz.transition 2003, 3, :o6, 1048971600
+          tz.transition 2003, 10, :o5, 1067115600
+          tz.transition 2004, 3, :o6, 1080421200
+          tz.transition 2004, 10, :o5, 1099170000
+          tz.transition 2005, 3, :o6, 1111870800
+          tz.transition 2005, 10, :o5, 1130619600
+          tz.transition 2006, 3, :o6, 1143320400
+          tz.transition 2006, 10, :o5, 1162069200
+          tz.transition 2007, 3, :o6, 1174770000
+          tz.transition 2007, 10, :o5, 1193518800
+          tz.transition 2008, 3, :o6, 1206824400
+          tz.transition 2008, 10, :o5, 1224968400
+          tz.transition 2009, 3, :o6, 1238274000
+          tz.transition 2009, 10, :o5, 1256418000
+          tz.transition 2010, 3, :o6, 1269723600
+          tz.transition 2010, 10, :o5, 1288472400
+          tz.transition 2011, 3, :o6, 1301173200
+          tz.transition 2011, 10, :o5, 1319922000
+          tz.transition 2012, 3, :o6, 1332622800
+          tz.transition 2012, 10, :o5, 1351371600
+          tz.transition 2013, 3, :o6, 1364677200
+          tz.transition 2013, 10, :o5, 1382821200
+          tz.transition 2014, 3, :o6, 1396126800
+          tz.transition 2014, 10, :o5, 1414270800
+          tz.transition 2015, 3, :o6, 1427576400
+          tz.transition 2015, 10, :o5, 1445720400
+          tz.transition 2016, 3, :o6, 1459026000
+          tz.transition 2016, 10, :o5, 1477774800
+          tz.transition 2017, 3, :o6, 1490475600
+          tz.transition 2017, 10, :o5, 1509224400
+          tz.transition 2018, 3, :o6, 1521925200
+          tz.transition 2018, 10, :o5, 1540674000
+          tz.transition 2019, 3, :o6, 1553979600
+          tz.transition 2019, 10, :o5, 1572123600
+          tz.transition 2020, 3, :o6, 1585429200
+          tz.transition 2020, 10, :o5, 1603573200
+          tz.transition 2021, 3, :o6, 1616878800
+          tz.transition 2021, 10, :o5, 1635627600
+          tz.transition 2022, 3, :o6, 1648328400
+          tz.transition 2022, 10, :o5, 1667077200
+          tz.transition 2023, 3, :o6, 1679778000
+          tz.transition 2023, 10, :o5, 1698526800
+          tz.transition 2024, 3, :o6, 1711832400
+          tz.transition 2024, 10, :o5, 1729976400
+          tz.transition 2025, 3, :o6, 1743282000
+          tz.transition 2025, 10, :o5, 1761426000
+          tz.transition 2026, 3, :o6, 1774731600
+          tz.transition 2026, 10, :o5, 1792875600
+          tz.transition 2027, 3, :o6, 1806181200
+          tz.transition 2027, 10, :o5, 1824930000
+          tz.transition 2028, 3, :o6, 1837630800
+          tz.transition 2028, 10, :o5, 1856379600
+          tz.transition 2029, 3, :o6, 1869080400
+          tz.transition 2029, 10, :o5, 1887829200
+          tz.transition 2030, 3, :o6, 1901134800
+          tz.transition 2030, 10, :o5, 1919278800
+          tz.transition 2031, 3, :o6, 1932584400
+          tz.transition 2031, 10, :o5, 1950728400
+          tz.transition 2032, 3, :o6, 1964034000
+          tz.transition 2032, 10, :o5, 1982782800
+          tz.transition 2033, 3, :o6, 1995483600
+          tz.transition 2033, 10, :o5, 2014232400
+          tz.transition 2034, 3, :o6, 2026933200
+          tz.transition 2034, 10, :o5, 2045682000
+          tz.transition 2035, 3, :o6, 2058382800
+          tz.transition 2035, 10, :o5, 2077131600
+          tz.transition 2036, 3, :o6, 2090437200
+          tz.transition 2036, 10, :o5, 2108581200
+          tz.transition 2037, 3, :o6, 2121886800
+          tz.transition 2037, 10, :o5, 2140030800
+          tz.transition 2038, 3, :o6, 19724083, 8
+          tz.transition 2038, 10, :o5, 19725819, 8
+          tz.transition 2039, 3, :o6, 19726995, 8
+          tz.transition 2039, 10, :o5, 19728731, 8
+          tz.transition 2040, 3, :o6, 19729907, 8
+          tz.transition 2040, 10, :o5, 19731643, 8
+          tz.transition 2041, 3, :o6, 19732875, 8
+          tz.transition 2041, 10, :o5, 19734555, 8
+          tz.transition 2042, 3, :o6, 19735787, 8
+          tz.transition 2042, 10, :o5, 19737467, 8
+          tz.transition 2043, 3, :o6, 19738699, 8
+          tz.transition 2043, 10, :o5, 19740379, 8
+          tz.transition 2044, 3, :o6, 19741611, 8
+          tz.transition 2044, 10, :o5, 19743347, 8
+          tz.transition 2045, 3, :o6, 19744523, 8
+          tz.transition 2045, 10, :o5, 19746259, 8
+          tz.transition 2046, 3, :o6, 19747435, 8
+          tz.transition 2046, 10, :o5, 19749171, 8
+          tz.transition 2047, 3, :o6, 19750403, 8
+          tz.transition 2047, 10, :o5, 19752083, 8
+          tz.transition 2048, 3, :o6, 19753315, 8
+          tz.transition 2048, 10, :o5, 19754995, 8
+          tz.transition 2049, 3, :o6, 19756227, 8
+          tz.transition 2049, 10, :o5, 19757963, 8
+          tz.transition 2050, 3, :o6, 19759139, 8
+          tz.transition 2050, 10, :o5, 19760875, 8
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yerevan.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yerevan.rb
new file mode 100644
index 00000000..e7f16086
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yerevan.rb
@@ -0,0 +1,165 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Yerevan
+        include TimezoneDefinition
+        
+        timezone 'Asia/Yerevan' do |tz|
+          tz.offset :o0, 10680, 0, :LMT
+          tz.offset :o1, 10800, 0, :YERT
+          tz.offset :o2, 14400, 0, :YERT
+          tz.offset :o3, 14400, 3600, :YERST
+          tz.offset :o4, 10800, 3600, :YERST
+          tz.offset :o5, 10800, 3600, :AMST
+          tz.offset :o6, 10800, 0, :AMT
+          tz.offset :o7, 14400, 0, :AMT
+          tz.offset :o8, 14400, 3600, :AMST
+          
+          tz.transition 1924, 5, :o1, 1745213311, 720
+          tz.transition 1957, 2, :o2, 19487187, 8
+          tz.transition 1981, 3, :o3, 354916800
+          tz.transition 1981, 9, :o2, 370724400
+          tz.transition 1982, 3, :o3, 386452800
+          tz.transition 1982, 9, :o2, 402260400
+          tz.transition 1983, 3, :o3, 417988800
+          tz.transition 1983, 9, :o2, 433796400
+          tz.transition 1984, 3, :o3, 449611200
+          tz.transition 1984, 9, :o2, 465343200
+          tz.transition 1985, 3, :o3, 481068000
+          tz.transition 1985, 9, :o2, 496792800
+          tz.transition 1986, 3, :o3, 512517600
+          tz.transition 1986, 9, :o2, 528242400
+          tz.transition 1987, 3, :o3, 543967200
+          tz.transition 1987, 9, :o2, 559692000
+          tz.transition 1988, 3, :o3, 575416800
+          tz.transition 1988, 9, :o2, 591141600
+          tz.transition 1989, 3, :o3, 606866400
+          tz.transition 1989, 9, :o2, 622591200
+          tz.transition 1990, 3, :o3, 638316000
+          tz.transition 1990, 9, :o2, 654645600
+          tz.transition 1991, 3, :o4, 670370400
+          tz.transition 1991, 9, :o5, 685569600
+          tz.transition 1991, 9, :o6, 686098800
+          tz.transition 1992, 3, :o5, 701812800
+          tz.transition 1992, 9, :o6, 717534000
+          tz.transition 1993, 3, :o5, 733273200
+          tz.transition 1993, 9, :o6, 748998000
+          tz.transition 1994, 3, :o5, 764722800
+          tz.transition 1994, 9, :o6, 780447600
+          tz.transition 1995, 3, :o5, 796172400
+          tz.transition 1995, 9, :o7, 811897200
+          tz.transition 1997, 3, :o8, 859672800
+          tz.transition 1997, 10, :o7, 877816800
+          tz.transition 1998, 3, :o8, 891122400
+          tz.transition 1998, 10, :o7, 909266400
+          tz.transition 1999, 3, :o8, 922572000
+          tz.transition 1999, 10, :o7, 941320800
+          tz.transition 2000, 3, :o8, 954021600
+          tz.transition 2000, 10, :o7, 972770400
+          tz.transition 2001, 3, :o8, 985471200
+          tz.transition 2001, 10, :o7, 1004220000
+          tz.transition 2002, 3, :o8, 1017525600
+          tz.transition 2002, 10, :o7, 1035669600
+          tz.transition 2003, 3, :o8, 1048975200
+          tz.transition 2003, 10, :o7, 1067119200
+          tz.transition 2004, 3, :o8, 1080424800
+          tz.transition 2004, 10, :o7, 1099173600
+          tz.transition 2005, 3, :o8, 1111874400
+          tz.transition 2005, 10, :o7, 1130623200
+          tz.transition 2006, 3, :o8, 1143324000
+          tz.transition 2006, 10, :o7, 1162072800
+          tz.transition 2007, 3, :o8, 1174773600
+          tz.transition 2007, 10, :o7, 1193522400
+          tz.transition 2008, 3, :o8, 1206828000
+          tz.transition 2008, 10, :o7, 1224972000
+          tz.transition 2009, 3, :o8, 1238277600
+          tz.transition 2009, 10, :o7, 1256421600
+          tz.transition 2010, 3, :o8, 1269727200
+          tz.transition 2010, 10, :o7, 1288476000
+          tz.transition 2011, 3, :o8, 1301176800
+          tz.transition 2011, 10, :o7, 1319925600
+          tz.transition 2012, 3, :o8, 1332626400
+          tz.transition 2012, 10, :o7, 1351375200
+          tz.transition 2013, 3, :o8, 1364680800
+          tz.transition 2013, 10, :o7, 1382824800
+          tz.transition 2014, 3, :o8, 1396130400
+          tz.transition 2014, 10, :o7, 1414274400
+          tz.transition 2015, 3, :o8, 1427580000
+          tz.transition 2015, 10, :o7, 1445724000
+          tz.transition 2016, 3, :o8, 1459029600
+          tz.transition 2016, 10, :o7, 1477778400
+          tz.transition 2017, 3, :o8, 1490479200
+          tz.transition 2017, 10, :o7, 1509228000
+          tz.transition 2018, 3, :o8, 1521928800
+          tz.transition 2018, 10, :o7, 1540677600
+          tz.transition 2019, 3, :o8, 1553983200
+          tz.transition 2019, 10, :o7, 1572127200
+          tz.transition 2020, 3, :o8, 1585432800
+          tz.transition 2020, 10, :o7, 1603576800
+          tz.transition 2021, 3, :o8, 1616882400
+          tz.transition 2021, 10, :o7, 1635631200
+          tz.transition 2022, 3, :o8, 1648332000
+          tz.transition 2022, 10, :o7, 1667080800
+          tz.transition 2023, 3, :o8, 1679781600
+          tz.transition 2023, 10, :o7, 1698530400
+          tz.transition 2024, 3, :o8, 1711836000
+          tz.transition 2024, 10, :o7, 1729980000
+          tz.transition 2025, 3, :o8, 1743285600
+          tz.transition 2025, 10, :o7, 1761429600
+          tz.transition 2026, 3, :o8, 1774735200
+          tz.transition 2026, 10, :o7, 1792879200
+          tz.transition 2027, 3, :o8, 1806184800
+          tz.transition 2027, 10, :o7, 1824933600
+          tz.transition 2028, 3, :o8, 1837634400
+          tz.transition 2028, 10, :o7, 1856383200
+          tz.transition 2029, 3, :o8, 1869084000
+          tz.transition 2029, 10, :o7, 1887832800
+          tz.transition 2030, 3, :o8, 1901138400
+          tz.transition 2030, 10, :o7, 1919282400
+          tz.transition 2031, 3, :o8, 1932588000
+          tz.transition 2031, 10, :o7, 1950732000
+          tz.transition 2032, 3, :o8, 1964037600
+          tz.transition 2032, 10, :o7, 1982786400
+          tz.transition 2033, 3, :o8, 1995487200
+          tz.transition 2033, 10, :o7, 2014236000
+          tz.transition 2034, 3, :o8, 2026936800
+          tz.transition 2034, 10, :o7, 2045685600
+          tz.transition 2035, 3, :o8, 2058386400
+          tz.transition 2035, 10, :o7, 2077135200
+          tz.transition 2036, 3, :o8, 2090440800
+          tz.transition 2036, 10, :o7, 2108584800
+          tz.transition 2037, 3, :o8, 2121890400
+          tz.transition 2037, 10, :o7, 2140034400
+          tz.transition 2038, 3, :o8, 29586125, 12
+          tz.transition 2038, 10, :o7, 29588729, 12
+          tz.transition 2039, 3, :o8, 29590493, 12
+          tz.transition 2039, 10, :o7, 29593097, 12
+          tz.transition 2040, 3, :o8, 29594861, 12
+          tz.transition 2040, 10, :o7, 29597465, 12
+          tz.transition 2041, 3, :o8, 29599313, 12
+          tz.transition 2041, 10, :o7, 29601833, 12
+          tz.transition 2042, 3, :o8, 29603681, 12
+          tz.transition 2042, 10, :o7, 29606201, 12
+          tz.transition 2043, 3, :o8, 29608049, 12
+          tz.transition 2043, 10, :o7, 29610569, 12
+          tz.transition 2044, 3, :o8, 29612417, 12
+          tz.transition 2044, 10, :o7, 29615021, 12
+          tz.transition 2045, 3, :o8, 29616785, 12
+          tz.transition 2045, 10, :o7, 29619389, 12
+          tz.transition 2046, 3, :o8, 29621153, 12
+          tz.transition 2046, 10, :o7, 29623757, 12
+          tz.transition 2047, 3, :o8, 29625605, 12
+          tz.transition 2047, 10, :o7, 29628125, 12
+          tz.transition 2048, 3, :o8, 29629973, 12
+          tz.transition 2048, 10, :o7, 29632493, 12
+          tz.transition 2049, 3, :o8, 29634341, 12
+          tz.transition 2049, 10, :o7, 29636945, 12
+          tz.transition 2050, 3, :o8, 29638709, 12
+          tz.transition 2050, 10, :o7, 29641313, 12
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Azores.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Azores.rb
new file mode 100644
index 00000000..1bd16a75
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Azores.rb
@@ -0,0 +1,270 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Atlantic
+      module Azores
+        include TimezoneDefinition
+        
+        timezone 'Atlantic/Azores' do |tz|
+          tz.offset :o0, -6160, 0, :LMT
+          tz.offset :o1, -6872, 0, :HMT
+          tz.offset :o2, -7200, 0, :AZOT
+          tz.offset :o3, -7200, 3600, :AZOST
+          tz.offset :o4, -7200, 7200, :AZOMT
+          tz.offset :o5, -3600, 0, :AZOT
+          tz.offset :o6, -3600, 3600, :AZOST
+          tz.offset :o7, 0, 0, :WET
+          
+          tz.transition 1884, 1, :o1, 2601910697, 1080
+          tz.transition 1911, 5, :o2, 26127150259, 10800
+          tz.transition 1916, 6, :o3, 58104781, 24
+          tz.transition 1916, 11, :o2, 29054023, 12
+          tz.transition 1917, 3, :o3, 58110925, 24
+          tz.transition 1917, 10, :o2, 58116397, 24
+          tz.transition 1918, 3, :o3, 58119709, 24
+          tz.transition 1918, 10, :o2, 58125157, 24
+          tz.transition 1919, 3, :o3, 58128445, 24
+          tz.transition 1919, 10, :o2, 58133917, 24
+          tz.transition 1920, 3, :o3, 58137229, 24
+          tz.transition 1920, 10, :o2, 58142701, 24
+          tz.transition 1921, 3, :o3, 58145989, 24
+          tz.transition 1921, 10, :o2, 58151461, 24
+          tz.transition 1924, 4, :o3, 58173421, 24
+          tz.transition 1924, 10, :o2, 58177765, 24
+          tz.transition 1926, 4, :o3, 58190965, 24
+          tz.transition 1926, 10, :o2, 58194997, 24
+          tz.transition 1927, 4, :o3, 58199533, 24
+          tz.transition 1927, 10, :o2, 58203733, 24
+          tz.transition 1928, 4, :o3, 58208437, 24
+          tz.transition 1928, 10, :o2, 58212637, 24
+          tz.transition 1929, 4, :o3, 58217341, 24
+          tz.transition 1929, 10, :o2, 58221373, 24
+          tz.transition 1931, 4, :o3, 58234813, 24
+          tz.transition 1931, 10, :o2, 58238845, 24
+          tz.transition 1932, 4, :o3, 58243213, 24
+          tz.transition 1932, 10, :o2, 58247581, 24
+          tz.transition 1934, 4, :o3, 58260853, 24
+          tz.transition 1934, 10, :o2, 58265221, 24
+          tz.transition 1935, 3, :o3, 58269421, 24
+          tz.transition 1935, 10, :o2, 58273957, 24
+          tz.transition 1936, 4, :o3, 58278661, 24
+          tz.transition 1936, 10, :o2, 58282693, 24
+          tz.transition 1937, 4, :o3, 58287061, 24
+          tz.transition 1937, 10, :o2, 58291429, 24
+          tz.transition 1938, 3, :o3, 58295629, 24
+          tz.transition 1938, 10, :o2, 58300165, 24
+          tz.transition 1939, 4, :o3, 58304869, 24
+          tz.transition 1939, 11, :o2, 58310077, 24
+          tz.transition 1940, 2, :o3, 58312429, 24
+          tz.transition 1940, 10, :o2, 58317805, 24
+          tz.transition 1941, 4, :o3, 58322173, 24
+          tz.transition 1941, 10, :o2, 58326565, 24
+          tz.transition 1942, 3, :o3, 58330405, 24
+          tz.transition 1942, 4, :o4, 4860951, 2
+          tz.transition 1942, 8, :o3, 4861175, 2
+          tz.transition 1942, 10, :o2, 58335781, 24
+          tz.transition 1943, 3, :o3, 58339141, 24
+          tz.transition 1943, 4, :o4, 4861665, 2
+          tz.transition 1943, 8, :o3, 4861931, 2
+          tz.transition 1943, 10, :o2, 58344685, 24
+          tz.transition 1944, 3, :o3, 58347877, 24
+          tz.transition 1944, 4, :o4, 4862407, 2
+          tz.transition 1944, 8, :o3, 4862659, 2
+          tz.transition 1944, 10, :o2, 58353421, 24
+          tz.transition 1945, 3, :o3, 58356613, 24
+          tz.transition 1945, 4, :o4, 4863135, 2
+          tz.transition 1945, 8, :o3, 4863387, 2
+          tz.transition 1945, 10, :o2, 58362157, 24
+          tz.transition 1946, 4, :o3, 58366021, 24
+          tz.transition 1946, 10, :o2, 58370389, 24
+          tz.transition 1947, 4, :o3, 7296845, 3
+          tz.transition 1947, 10, :o2, 7297391, 3
+          tz.transition 1948, 4, :o3, 7297937, 3
+          tz.transition 1948, 10, :o2, 7298483, 3
+          tz.transition 1949, 4, :o3, 7299029, 3
+          tz.transition 1949, 10, :o2, 7299575, 3
+          tz.transition 1951, 4, :o3, 7301213, 3
+          tz.transition 1951, 10, :o2, 7301780, 3
+          tz.transition 1952, 4, :o3, 7302326, 3
+          tz.transition 1952, 10, :o2, 7302872, 3
+          tz.transition 1953, 4, :o3, 7303418, 3
+          tz.transition 1953, 10, :o2, 7303964, 3
+          tz.transition 1954, 4, :o3, 7304510, 3
+          tz.transition 1954, 10, :o2, 7305056, 3
+          tz.transition 1955, 4, :o3, 7305602, 3
+          tz.transition 1955, 10, :o2, 7306148, 3
+          tz.transition 1956, 4, :o3, 7306694, 3
+          tz.transition 1956, 10, :o2, 7307261, 3
+          tz.transition 1957, 4, :o3, 7307807, 3
+          tz.transition 1957, 10, :o2, 7308353, 3
+          tz.transition 1958, 4, :o3, 7308899, 3
+          tz.transition 1958, 10, :o2, 7309445, 3
+          tz.transition 1959, 4, :o3, 7309991, 3
+          tz.transition 1959, 10, :o2, 7310537, 3
+          tz.transition 1960, 4, :o3, 7311083, 3
+          tz.transition 1960, 10, :o2, 7311629, 3
+          tz.transition 1961, 4, :o3, 7312175, 3
+          tz.transition 1961, 10, :o2, 7312721, 3
+          tz.transition 1962, 4, :o3, 7313267, 3
+          tz.transition 1962, 10, :o2, 7313834, 3
+          tz.transition 1963, 4, :o3, 7314380, 3
+          tz.transition 1963, 10, :o2, 7314926, 3
+          tz.transition 1964, 4, :o3, 7315472, 3
+          tz.transition 1964, 10, :o2, 7316018, 3
+          tz.transition 1965, 4, :o3, 7316564, 3
+          tz.transition 1965, 10, :o2, 7317110, 3
+          tz.transition 1966, 4, :o5, 7317656, 3
+          tz.transition 1977, 3, :o6, 228272400
+          tz.transition 1977, 9, :o5, 243997200
+          tz.transition 1978, 4, :o6, 260326800
+          tz.transition 1978, 10, :o5, 276051600
+          tz.transition 1979, 4, :o6, 291776400
+          tz.transition 1979, 9, :o5, 307504800
+          tz.transition 1980, 3, :o6, 323226000
+          tz.transition 1980, 9, :o5, 338954400
+          tz.transition 1981, 3, :o6, 354679200
+          tz.transition 1981, 9, :o5, 370404000
+          tz.transition 1982, 3, :o6, 386128800
+          tz.transition 1982, 9, :o5, 401853600
+          tz.transition 1983, 3, :o6, 417582000
+          tz.transition 1983, 9, :o5, 433303200
+          tz.transition 1984, 3, :o6, 449028000
+          tz.transition 1984, 9, :o5, 465357600
+          tz.transition 1985, 3, :o6, 481082400
+          tz.transition 1985, 9, :o5, 496807200
+          tz.transition 1986, 3, :o6, 512532000
+          tz.transition 1986, 9, :o5, 528256800
+          tz.transition 1987, 3, :o6, 543981600
+          tz.transition 1987, 9, :o5, 559706400
+          tz.transition 1988, 3, :o6, 575431200
+          tz.transition 1988, 9, :o5, 591156000
+          tz.transition 1989, 3, :o6, 606880800
+          tz.transition 1989, 9, :o5, 622605600
+          tz.transition 1990, 3, :o6, 638330400
+          tz.transition 1990, 9, :o5, 654660000
+          tz.transition 1991, 3, :o6, 670384800
+          tz.transition 1991, 9, :o5, 686109600
+          tz.transition 1992, 3, :o6, 701834400
+          tz.transition 1992, 9, :o7, 717559200
+          tz.transition 1993, 3, :o6, 733280400
+          tz.transition 1993, 9, :o5, 749005200
+          tz.transition 1994, 3, :o6, 764730000
+          tz.transition 1994, 9, :o5, 780454800
+          tz.transition 1995, 3, :o6, 796179600
+          tz.transition 1995, 9, :o5, 811904400
+          tz.transition 1996, 3, :o6, 828234000
+          tz.transition 1996, 10, :o5, 846378000
+          tz.transition 1997, 3, :o6, 859683600
+          tz.transition 1997, 10, :o5, 877827600
+          tz.transition 1998, 3, :o6, 891133200
+          tz.transition 1998, 10, :o5, 909277200
+          tz.transition 1999, 3, :o6, 922582800
+          tz.transition 1999, 10, :o5, 941331600
+          tz.transition 2000, 3, :o6, 954032400
+          tz.transition 2000, 10, :o5, 972781200
+          tz.transition 2001, 3, :o6, 985482000
+          tz.transition 2001, 10, :o5, 1004230800
+          tz.transition 2002, 3, :o6, 1017536400
+          tz.transition 2002, 10, :o5, 1035680400
+          tz.transition 2003, 3, :o6, 1048986000
+          tz.transition 2003, 10, :o5, 1067130000
+          tz.transition 2004, 3, :o6, 1080435600
+          tz.transition 2004, 10, :o5, 1099184400
+          tz.transition 2005, 3, :o6, 1111885200
+          tz.transition 2005, 10, :o5, 1130634000
+          tz.transition 2006, 3, :o6, 1143334800
+          tz.transition 2006, 10, :o5, 1162083600
+          tz.transition 2007, 3, :o6, 1174784400
+          tz.transition 2007, 10, :o5, 1193533200
+          tz.transition 2008, 3, :o6, 1206838800
+          tz.transition 2008, 10, :o5, 1224982800
+          tz.transition 2009, 3, :o6, 1238288400
+          tz.transition 2009, 10, :o5, 1256432400
+          tz.transition 2010, 3, :o6, 1269738000
+          tz.transition 2010, 10, :o5, 1288486800
+          tz.transition 2011, 3, :o6, 1301187600
+          tz.transition 2011, 10, :o5, 1319936400
+          tz.transition 2012, 3, :o6, 1332637200
+          tz.transition 2012, 10, :o5, 1351386000
+          tz.transition 2013, 3, :o6, 1364691600
+          tz.transition 2013, 10, :o5, 1382835600
+          tz.transition 2014, 3, :o6, 1396141200
+          tz.transition 2014, 10, :o5, 1414285200
+          tz.transition 2015, 3, :o6, 1427590800
+          tz.transition 2015, 10, :o5, 1445734800
+          tz.transition 2016, 3, :o6, 1459040400
+          tz.transition 2016, 10, :o5, 1477789200
+          tz.transition 2017, 3, :o6, 1490490000
+          tz.transition 2017, 10, :o5, 1509238800
+          tz.transition 2018, 3, :o6, 1521939600
+          tz.transition 2018, 10, :o5, 1540688400
+          tz.transition 2019, 3, :o6, 1553994000
+          tz.transition 2019, 10, :o5, 1572138000
+          tz.transition 2020, 3, :o6, 1585443600
+          tz.transition 2020, 10, :o5, 1603587600
+          tz.transition 2021, 3, :o6, 1616893200
+          tz.transition 2021, 10, :o5, 1635642000
+          tz.transition 2022, 3, :o6, 1648342800
+          tz.transition 2022, 10, :o5, 1667091600
+          tz.transition 2023, 3, :o6, 1679792400
+          tz.transition 2023, 10, :o5, 1698541200
+          tz.transition 2024, 3, :o6, 1711846800
+          tz.transition 2024, 10, :o5, 1729990800
+          tz.transition 2025, 3, :o6, 1743296400
+          tz.transition 2025, 10, :o5, 1761440400
+          tz.transition 2026, 3, :o6, 1774746000
+          tz.transition 2026, 10, :o5, 1792890000
+          tz.transition 2027, 3, :o6, 1806195600
+          tz.transition 2027, 10, :o5, 1824944400
+          tz.transition 2028, 3, :o6, 1837645200
+          tz.transition 2028, 10, :o5, 1856394000
+          tz.transition 2029, 3, :o6, 1869094800
+          tz.transition 2029, 10, :o5, 1887843600
+          tz.transition 2030, 3, :o6, 1901149200
+          tz.transition 2030, 10, :o5, 1919293200
+          tz.transition 2031, 3, :o6, 1932598800
+          tz.transition 2031, 10, :o5, 1950742800
+          tz.transition 2032, 3, :o6, 1964048400
+          tz.transition 2032, 10, :o5, 1982797200
+          tz.transition 2033, 3, :o6, 1995498000
+          tz.transition 2033, 10, :o5, 2014246800
+          tz.transition 2034, 3, :o6, 2026947600
+          tz.transition 2034, 10, :o5, 2045696400
+          tz.transition 2035, 3, :o6, 2058397200
+          tz.transition 2035, 10, :o5, 2077146000
+          tz.transition 2036, 3, :o6, 2090451600
+          tz.transition 2036, 10, :o5, 2108595600
+          tz.transition 2037, 3, :o6, 2121901200
+          tz.transition 2037, 10, :o5, 2140045200
+          tz.transition 2038, 3, :o6, 59172253, 24
+          tz.transition 2038, 10, :o5, 59177461, 24
+          tz.transition 2039, 3, :o6, 59180989, 24
+          tz.transition 2039, 10, :o5, 59186197, 24
+          tz.transition 2040, 3, :o6, 59189725, 24
+          tz.transition 2040, 10, :o5, 59194933, 24
+          tz.transition 2041, 3, :o6, 59198629, 24
+          tz.transition 2041, 10, :o5, 59203669, 24
+          tz.transition 2042, 3, :o6, 59207365, 24
+          tz.transition 2042, 10, :o5, 59212405, 24
+          tz.transition 2043, 3, :o6, 59216101, 24
+          tz.transition 2043, 10, :o5, 59221141, 24
+          tz.transition 2044, 3, :o6, 59224837, 24
+          tz.transition 2044, 10, :o5, 59230045, 24
+          tz.transition 2045, 3, :o6, 59233573, 24
+          tz.transition 2045, 10, :o5, 59238781, 24
+          tz.transition 2046, 3, :o6, 59242309, 24
+          tz.transition 2046, 10, :o5, 59247517, 24
+          tz.transition 2047, 3, :o6, 59251213, 24
+          tz.transition 2047, 10, :o5, 59256253, 24
+          tz.transition 2048, 3, :o6, 59259949, 24
+          tz.transition 2048, 10, :o5, 59264989, 24
+          tz.transition 2049, 3, :o6, 59268685, 24
+          tz.transition 2049, 10, :o5, 59273893, 24
+          tz.transition 2050, 3, :o6, 59277421, 24
+          tz.transition 2050, 10, :o5, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Cape_Verde.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Cape_Verde.rb
new file mode 100644
index 00000000..61c8c150
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Cape_Verde.rb
@@ -0,0 +1,23 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Atlantic
+      module Cape_Verde
+        include TimezoneDefinition
+        
+        timezone 'Atlantic/Cape_Verde' do |tz|
+          tz.offset :o0, -5644, 0, :LMT
+          tz.offset :o1, -7200, 0, :CVT
+          tz.offset :o2, -7200, 3600, :CVST
+          tz.offset :o3, -3600, 0, :CVT
+          
+          tz.transition 1907, 1, :o1, 52219653811, 21600
+          tz.transition 1942, 9, :o2, 29167243, 12
+          tz.transition 1945, 10, :o1, 58361845, 24
+          tz.transition 1975, 11, :o3, 186120000
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/South_Georgia.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/South_Georgia.rb
new file mode 100644
index 00000000..6a4cbafb
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/South_Georgia.rb
@@ -0,0 +1,18 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Atlantic
+      module South_Georgia
+        include TimezoneDefinition
+        
+        timezone 'Atlantic/South_Georgia' do |tz|
+          tz.offset :o0, -8768, 0, :LMT
+          tz.offset :o1, -7200, 0, :GST
+          
+          tz.transition 1890, 1, :o1, 1627673806, 675
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Adelaide.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Adelaide.rb
new file mode 100644
index 00000000..c5d561cc
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Adelaide.rb
@@ -0,0 +1,187 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Australia
+      module Adelaide
+        include TimezoneDefinition
+        
+        timezone 'Australia/Adelaide' do |tz|
+          tz.offset :o0, 33260, 0, :LMT
+          tz.offset :o1, 32400, 0, :CST
+          tz.offset :o2, 34200, 0, :CST
+          tz.offset :o3, 34200, 3600, :CST
+          
+          tz.transition 1895, 1, :o1, 10425132497, 4320
+          tz.transition 1899, 4, :o2, 19318201, 8
+          tz.transition 1916, 12, :o3, 3486569911, 1440
+          tz.transition 1917, 3, :o2, 116222983, 48
+          tz.transition 1941, 12, :o3, 38885763, 16
+          tz.transition 1942, 3, :o2, 116661463, 48
+          tz.transition 1942, 9, :o3, 38890067, 16
+          tz.transition 1943, 3, :o2, 116678935, 48
+          tz.transition 1943, 10, :o3, 38896003, 16
+          tz.transition 1944, 3, :o2, 116696407, 48
+          tz.transition 1971, 10, :o3, 57688200
+          tz.transition 1972, 2, :o2, 67969800
+          tz.transition 1972, 10, :o3, 89137800
+          tz.transition 1973, 3, :o2, 100024200
+          tz.transition 1973, 10, :o3, 120587400
+          tz.transition 1974, 3, :o2, 131473800
+          tz.transition 1974, 10, :o3, 152037000
+          tz.transition 1975, 3, :o2, 162923400
+          tz.transition 1975, 10, :o3, 183486600
+          tz.transition 1976, 3, :o2, 194977800
+          tz.transition 1976, 10, :o3, 215541000
+          tz.transition 1977, 3, :o2, 226427400
+          tz.transition 1977, 10, :o3, 246990600
+          tz.transition 1978, 3, :o2, 257877000
+          tz.transition 1978, 10, :o3, 278440200
+          tz.transition 1979, 3, :o2, 289326600
+          tz.transition 1979, 10, :o3, 309889800
+          tz.transition 1980, 3, :o2, 320776200
+          tz.transition 1980, 10, :o3, 341339400
+          tz.transition 1981, 2, :o2, 352225800
+          tz.transition 1981, 10, :o3, 372789000
+          tz.transition 1982, 3, :o2, 384280200
+          tz.transition 1982, 10, :o3, 404843400
+          tz.transition 1983, 3, :o2, 415729800
+          tz.transition 1983, 10, :o3, 436293000
+          tz.transition 1984, 3, :o2, 447179400
+          tz.transition 1984, 10, :o3, 467742600
+          tz.transition 1985, 3, :o2, 478629000
+          tz.transition 1985, 10, :o3, 499192200
+          tz.transition 1986, 3, :o2, 511288200
+          tz.transition 1986, 10, :o3, 530037000
+          tz.transition 1987, 3, :o2, 542737800
+          tz.transition 1987, 10, :o3, 562091400
+          tz.transition 1988, 3, :o2, 574792200
+          tz.transition 1988, 10, :o3, 594145800
+          tz.transition 1989, 3, :o2, 606241800
+          tz.transition 1989, 10, :o3, 625595400
+          tz.transition 1990, 3, :o2, 637691400
+          tz.transition 1990, 10, :o3, 657045000
+          tz.transition 1991, 3, :o2, 667931400
+          tz.transition 1991, 10, :o3, 688494600
+          tz.transition 1992, 3, :o2, 701195400
+          tz.transition 1992, 10, :o3, 719944200
+          tz.transition 1993, 3, :o2, 731435400
+          tz.transition 1993, 10, :o3, 751998600
+          tz.transition 1994, 3, :o2, 764094600
+          tz.transition 1994, 10, :o3, 783448200
+          tz.transition 1995, 3, :o2, 796149000
+          tz.transition 1995, 10, :o3, 814897800
+          tz.transition 1996, 3, :o2, 828203400
+          tz.transition 1996, 10, :o3, 846347400
+          tz.transition 1997, 3, :o2, 859653000
+          tz.transition 1997, 10, :o3, 877797000
+          tz.transition 1998, 3, :o2, 891102600
+          tz.transition 1998, 10, :o3, 909246600
+          tz.transition 1999, 3, :o2, 922552200
+          tz.transition 1999, 10, :o3, 941301000
+          tz.transition 2000, 3, :o2, 954001800
+          tz.transition 2000, 10, :o3, 972750600
+          tz.transition 2001, 3, :o2, 985451400
+          tz.transition 2001, 10, :o3, 1004200200
+          tz.transition 2002, 3, :o2, 1017505800
+          tz.transition 2002, 10, :o3, 1035649800
+          tz.transition 2003, 3, :o2, 1048955400
+          tz.transition 2003, 10, :o3, 1067099400
+          tz.transition 2004, 3, :o2, 1080405000
+          tz.transition 2004, 10, :o3, 1099153800
+          tz.transition 2005, 3, :o2, 1111854600
+          tz.transition 2005, 10, :o3, 1130603400
+          tz.transition 2006, 4, :o2, 1143909000
+          tz.transition 2006, 10, :o3, 1162053000
+          tz.transition 2007, 3, :o2, 1174753800
+          tz.transition 2007, 10, :o3, 1193502600
+          tz.transition 2008, 4, :o2, 1207413000
+          tz.transition 2008, 10, :o3, 1223137800
+          tz.transition 2009, 4, :o2, 1238862600
+          tz.transition 2009, 10, :o3, 1254587400
+          tz.transition 2010, 4, :o2, 1270312200
+          tz.transition 2010, 10, :o3, 1286037000
+          tz.transition 2011, 4, :o2, 1301761800
+          tz.transition 2011, 10, :o3, 1317486600
+          tz.transition 2012, 3, :o2, 1333211400
+          tz.transition 2012, 10, :o3, 1349541000
+          tz.transition 2013, 4, :o2, 1365265800
+          tz.transition 2013, 10, :o3, 1380990600
+          tz.transition 2014, 4, :o2, 1396715400
+          tz.transition 2014, 10, :o3, 1412440200
+          tz.transition 2015, 4, :o2, 1428165000
+          tz.transition 2015, 10, :o3, 1443889800
+          tz.transition 2016, 4, :o2, 1459614600
+          tz.transition 2016, 10, :o3, 1475339400
+          tz.transition 2017, 4, :o2, 1491064200
+          tz.transition 2017, 9, :o3, 1506789000
+          tz.transition 2018, 3, :o2, 1522513800
+          tz.transition 2018, 10, :o3, 1538843400
+          tz.transition 2019, 4, :o2, 1554568200
+          tz.transition 2019, 10, :o3, 1570293000
+          tz.transition 2020, 4, :o2, 1586017800
+          tz.transition 2020, 10, :o3, 1601742600
+          tz.transition 2021, 4, :o2, 1617467400
+          tz.transition 2021, 10, :o3, 1633192200
+          tz.transition 2022, 4, :o2, 1648917000
+          tz.transition 2022, 10, :o3, 1664641800
+          tz.transition 2023, 4, :o2, 1680366600
+          tz.transition 2023, 9, :o3, 1696091400
+          tz.transition 2024, 4, :o2, 1712421000
+          tz.transition 2024, 10, :o3, 1728145800
+          tz.transition 2025, 4, :o2, 1743870600
+          tz.transition 2025, 10, :o3, 1759595400
+          tz.transition 2026, 4, :o2, 1775320200
+          tz.transition 2026, 10, :o3, 1791045000
+          tz.transition 2027, 4, :o2, 1806769800
+          tz.transition 2027, 10, :o3, 1822494600
+          tz.transition 2028, 4, :o2, 1838219400
+          tz.transition 2028, 9, :o3, 1853944200
+          tz.transition 2029, 3, :o2, 1869669000
+          tz.transition 2029, 10, :o3, 1885998600
+          tz.transition 2030, 4, :o2, 1901723400
+          tz.transition 2030, 10, :o3, 1917448200
+          tz.transition 2031, 4, :o2, 1933173000
+          tz.transition 2031, 10, :o3, 1948897800
+          tz.transition 2032, 4, :o2, 1964622600
+          tz.transition 2032, 10, :o3, 1980347400
+          tz.transition 2033, 4, :o2, 1996072200
+          tz.transition 2033, 10, :o3, 2011797000
+          tz.transition 2034, 4, :o2, 2027521800
+          tz.transition 2034, 9, :o3, 2043246600
+          tz.transition 2035, 3, :o2, 2058971400
+          tz.transition 2035, 10, :o3, 2075301000
+          tz.transition 2036, 4, :o2, 2091025800
+          tz.transition 2036, 10, :o3, 2106750600
+          tz.transition 2037, 4, :o2, 2122475400
+          tz.transition 2037, 10, :o3, 2138200200
+          tz.transition 2038, 4, :o2, 39448275, 16
+          tz.transition 2038, 10, :o3, 39451187, 16
+          tz.transition 2039, 4, :o2, 39454099, 16
+          tz.transition 2039, 10, :o3, 39457011, 16
+          tz.transition 2040, 3, :o2, 39459923, 16
+          tz.transition 2040, 10, :o3, 39462947, 16
+          tz.transition 2041, 4, :o2, 39465859, 16
+          tz.transition 2041, 10, :o3, 39468771, 16
+          tz.transition 2042, 4, :o2, 39471683, 16
+          tz.transition 2042, 10, :o3, 39474595, 16
+          tz.transition 2043, 4, :o2, 39477507, 16
+          tz.transition 2043, 10, :o3, 39480419, 16
+          tz.transition 2044, 4, :o2, 39483331, 16
+          tz.transition 2044, 10, :o3, 39486243, 16
+          tz.transition 2045, 4, :o2, 39489155, 16
+          tz.transition 2045, 9, :o3, 39492067, 16
+          tz.transition 2046, 3, :o2, 39494979, 16
+          tz.transition 2046, 10, :o3, 39498003, 16
+          tz.transition 2047, 4, :o2, 39500915, 16
+          tz.transition 2047, 10, :o3, 39503827, 16
+          tz.transition 2048, 4, :o2, 39506739, 16
+          tz.transition 2048, 10, :o3, 39509651, 16
+          tz.transition 2049, 4, :o2, 39512563, 16
+          tz.transition 2049, 10, :o3, 39515475, 16
+          tz.transition 2050, 4, :o2, 39518387, 16
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Brisbane.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Brisbane.rb
new file mode 100644
index 00000000..dd85ddae
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Brisbane.rb
@@ -0,0 +1,35 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Australia
+      module Brisbane
+        include TimezoneDefinition
+        
+        timezone 'Australia/Brisbane' do |tz|
+          tz.offset :o0, 36728, 0, :LMT
+          tz.offset :o1, 36000, 0, :EST
+          tz.offset :o2, 36000, 3600, :EST
+          
+          tz.transition 1894, 12, :o1, 26062496009, 10800
+          tz.transition 1916, 12, :o2, 3486569881, 1440
+          tz.transition 1917, 3, :o1, 19370497, 8
+          tz.transition 1941, 12, :o2, 14582161, 6
+          tz.transition 1942, 3, :o1, 19443577, 8
+          tz.transition 1942, 9, :o2, 14583775, 6
+          tz.transition 1943, 3, :o1, 19446489, 8
+          tz.transition 1943, 10, :o2, 14586001, 6
+          tz.transition 1944, 3, :o1, 19449401, 8
+          tz.transition 1971, 10, :o2, 57686400
+          tz.transition 1972, 2, :o1, 67968000
+          tz.transition 1989, 10, :o2, 625593600
+          tz.transition 1990, 3, :o1, 636480000
+          tz.transition 1990, 10, :o2, 657043200
+          tz.transition 1991, 3, :o1, 667929600
+          tz.transition 1991, 10, :o2, 688492800
+          tz.transition 1992, 2, :o1, 699379200
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Darwin.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Darwin.rb
new file mode 100644
index 00000000..17de8812
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Darwin.rb
@@ -0,0 +1,29 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Australia
+      module Darwin
+        include TimezoneDefinition
+        
+        timezone 'Australia/Darwin' do |tz|
+          tz.offset :o0, 31400, 0, :LMT
+          tz.offset :o1, 32400, 0, :CST
+          tz.offset :o2, 34200, 0, :CST
+          tz.offset :o3, 34200, 3600, :CST
+          
+          tz.transition 1895, 1, :o1, 1042513259, 432
+          tz.transition 1899, 4, :o2, 19318201, 8
+          tz.transition 1916, 12, :o3, 3486569911, 1440
+          tz.transition 1917, 3, :o2, 116222983, 48
+          tz.transition 1941, 12, :o3, 38885763, 16
+          tz.transition 1942, 3, :o2, 116661463, 48
+          tz.transition 1942, 9, :o3, 38890067, 16
+          tz.transition 1943, 3, :o2, 116678935, 48
+          tz.transition 1943, 10, :o3, 38896003, 16
+          tz.transition 1944, 3, :o2, 116696407, 48
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Hobart.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Hobart.rb
new file mode 100644
index 00000000..11384b98
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Hobart.rb
@@ -0,0 +1,193 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Australia
+      module Hobart
+        include TimezoneDefinition
+        
+        timezone 'Australia/Hobart' do |tz|
+          tz.offset :o0, 35356, 0, :LMT
+          tz.offset :o1, 36000, 0, :EST
+          tz.offset :o2, 36000, 3600, :EST
+          
+          tz.transition 1895, 8, :o1, 52130241161, 21600
+          tz.transition 1916, 9, :o2, 14526823, 6
+          tz.transition 1917, 3, :o1, 19370497, 8
+          tz.transition 1941, 12, :o2, 14582161, 6
+          tz.transition 1942, 3, :o1, 19443577, 8
+          tz.transition 1942, 9, :o2, 14583775, 6
+          tz.transition 1943, 3, :o1, 19446489, 8
+          tz.transition 1943, 10, :o2, 14586001, 6
+          tz.transition 1944, 3, :o1, 19449401, 8
+          tz.transition 1967, 9, :o2, 14638585, 6
+          tz.transition 1968, 3, :o1, 14639677, 6
+          tz.transition 1968, 10, :o2, 14640937, 6
+          tz.transition 1969, 3, :o1, 14641735, 6
+          tz.transition 1969, 10, :o2, 14643121, 6
+          tz.transition 1970, 3, :o1, 5673600
+          tz.transition 1970, 10, :o2, 25632000
+          tz.transition 1971, 3, :o1, 37728000
+          tz.transition 1971, 10, :o2, 57686400
+          tz.transition 1972, 2, :o1, 67968000
+          tz.transition 1972, 10, :o2, 89136000
+          tz.transition 1973, 3, :o1, 100022400
+          tz.transition 1973, 10, :o2, 120585600
+          tz.transition 1974, 3, :o1, 131472000
+          tz.transition 1974, 10, :o2, 152035200
+          tz.transition 1975, 3, :o1, 162921600
+          tz.transition 1975, 10, :o2, 183484800
+          tz.transition 1976, 3, :o1, 194976000
+          tz.transition 1976, 10, :o2, 215539200
+          tz.transition 1977, 3, :o1, 226425600
+          tz.transition 1977, 10, :o2, 246988800
+          tz.transition 1978, 3, :o1, 257875200
+          tz.transition 1978, 10, :o2, 278438400
+          tz.transition 1979, 3, :o1, 289324800
+          tz.transition 1979, 10, :o2, 309888000
+          tz.transition 1980, 3, :o1, 320774400
+          tz.transition 1980, 10, :o2, 341337600
+          tz.transition 1981, 2, :o1, 352224000
+          tz.transition 1981, 10, :o2, 372787200
+          tz.transition 1982, 3, :o1, 386092800
+          tz.transition 1982, 10, :o2, 404841600
+          tz.transition 1983, 3, :o1, 417542400
+          tz.transition 1983, 10, :o2, 436291200
+          tz.transition 1984, 3, :o1, 447177600
+          tz.transition 1984, 10, :o2, 467740800
+          tz.transition 1985, 3, :o1, 478627200
+          tz.transition 1985, 10, :o2, 499190400
+          tz.transition 1986, 3, :o1, 510076800
+          tz.transition 1986, 10, :o2, 530035200
+          tz.transition 1987, 3, :o1, 542736000
+          tz.transition 1987, 10, :o2, 562089600
+          tz.transition 1988, 3, :o1, 574790400
+          tz.transition 1988, 10, :o2, 594144000
+          tz.transition 1989, 3, :o1, 606240000
+          tz.transition 1989, 10, :o2, 625593600
+          tz.transition 1990, 3, :o1, 637689600
+          tz.transition 1990, 10, :o2, 657043200
+          tz.transition 1991, 3, :o1, 670348800
+          tz.transition 1991, 10, :o2, 686678400
+          tz.transition 1992, 3, :o1, 701798400
+          tz.transition 1992, 10, :o2, 718128000
+          tz.transition 1993, 3, :o1, 733248000
+          tz.transition 1993, 10, :o2, 749577600
+          tz.transition 1994, 3, :o1, 764697600
+          tz.transition 1994, 10, :o2, 781027200
+          tz.transition 1995, 3, :o1, 796147200
+          tz.transition 1995, 9, :o2, 812476800
+          tz.transition 1996, 3, :o1, 828201600
+          tz.transition 1996, 10, :o2, 844531200
+          tz.transition 1997, 3, :o1, 859651200
+          tz.transition 1997, 10, :o2, 875980800
+          tz.transition 1998, 3, :o1, 891100800
+          tz.transition 1998, 10, :o2, 907430400
+          tz.transition 1999, 3, :o1, 922550400
+          tz.transition 1999, 10, :o2, 938880000
+          tz.transition 2000, 3, :o1, 954000000
+          tz.transition 2000, 8, :o2, 967305600
+          tz.transition 2001, 3, :o1, 985449600
+          tz.transition 2001, 10, :o2, 1002384000
+          tz.transition 2002, 3, :o1, 1017504000
+          tz.transition 2002, 10, :o2, 1033833600
+          tz.transition 2003, 3, :o1, 1048953600
+          tz.transition 2003, 10, :o2, 1065283200
+          tz.transition 2004, 3, :o1, 1080403200
+          tz.transition 2004, 10, :o2, 1096732800
+          tz.transition 2005, 3, :o1, 1111852800
+          tz.transition 2005, 10, :o2, 1128182400
+          tz.transition 2006, 4, :o1, 1143907200
+          tz.transition 2006, 9, :o2, 1159632000
+          tz.transition 2007, 3, :o1, 1174752000
+          tz.transition 2007, 10, :o2, 1191686400
+          tz.transition 2008, 4, :o1, 1207411200
+          tz.transition 2008, 10, :o2, 1223136000
+          tz.transition 2009, 4, :o1, 1238860800
+          tz.transition 2009, 10, :o2, 1254585600
+          tz.transition 2010, 4, :o1, 1270310400
+          tz.transition 2010, 10, :o2, 1286035200
+          tz.transition 2011, 4, :o1, 1301760000
+          tz.transition 2011, 10, :o2, 1317484800
+          tz.transition 2012, 3, :o1, 1333209600
+          tz.transition 2012, 10, :o2, 1349539200
+          tz.transition 2013, 4, :o1, 1365264000
+          tz.transition 2013, 10, :o2, 1380988800
+          tz.transition 2014, 4, :o1, 1396713600
+          tz.transition 2014, 10, :o2, 1412438400
+          tz.transition 2015, 4, :o1, 1428163200
+          tz.transition 2015, 10, :o2, 1443888000
+          tz.transition 2016, 4, :o1, 1459612800
+          tz.transition 2016, 10, :o2, 1475337600
+          tz.transition 2017, 4, :o1, 1491062400
+          tz.transition 2017, 9, :o2, 1506787200
+          tz.transition 2018, 3, :o1, 1522512000
+          tz.transition 2018, 10, :o2, 1538841600
+          tz.transition 2019, 4, :o1, 1554566400
+          tz.transition 2019, 10, :o2, 1570291200
+          tz.transition 2020, 4, :o1, 1586016000
+          tz.transition 2020, 10, :o2, 1601740800
+          tz.transition 2021, 4, :o1, 1617465600
+          tz.transition 2021, 10, :o2, 1633190400
+          tz.transition 2022, 4, :o1, 1648915200
+          tz.transition 2022, 10, :o2, 1664640000
+          tz.transition 2023, 4, :o1, 1680364800
+          tz.transition 2023, 9, :o2, 1696089600
+          tz.transition 2024, 4, :o1, 1712419200
+          tz.transition 2024, 10, :o2, 1728144000
+          tz.transition 2025, 4, :o1, 1743868800
+          tz.transition 2025, 10, :o2, 1759593600
+          tz.transition 2026, 4, :o1, 1775318400
+          tz.transition 2026, 10, :o2, 1791043200
+          tz.transition 2027, 4, :o1, 1806768000
+          tz.transition 2027, 10, :o2, 1822492800
+          tz.transition 2028, 4, :o1, 1838217600
+          tz.transition 2028, 9, :o2, 1853942400
+          tz.transition 2029, 3, :o1, 1869667200
+          tz.transition 2029, 10, :o2, 1885996800
+          tz.transition 2030, 4, :o1, 1901721600
+          tz.transition 2030, 10, :o2, 1917446400
+          tz.transition 2031, 4, :o1, 1933171200
+          tz.transition 2031, 10, :o2, 1948896000
+          tz.transition 2032, 4, :o1, 1964620800
+          tz.transition 2032, 10, :o2, 1980345600
+          tz.transition 2033, 4, :o1, 1996070400
+          tz.transition 2033, 10, :o2, 2011795200
+          tz.transition 2034, 4, :o1, 2027520000
+          tz.transition 2034, 9, :o2, 2043244800
+          tz.transition 2035, 3, :o1, 2058969600
+          tz.transition 2035, 10, :o2, 2075299200
+          tz.transition 2036, 4, :o1, 2091024000
+          tz.transition 2036, 10, :o2, 2106748800
+          tz.transition 2037, 4, :o1, 2122473600
+          tz.transition 2037, 10, :o2, 2138198400
+          tz.transition 2038, 4, :o1, 14793103, 6
+          tz.transition 2038, 10, :o2, 14794195, 6
+          tz.transition 2039, 4, :o1, 14795287, 6
+          tz.transition 2039, 10, :o2, 14796379, 6
+          tz.transition 2040, 3, :o1, 14797471, 6
+          tz.transition 2040, 10, :o2, 14798605, 6
+          tz.transition 2041, 4, :o1, 14799697, 6
+          tz.transition 2041, 10, :o2, 14800789, 6
+          tz.transition 2042, 4, :o1, 14801881, 6
+          tz.transition 2042, 10, :o2, 14802973, 6
+          tz.transition 2043, 4, :o1, 14804065, 6
+          tz.transition 2043, 10, :o2, 14805157, 6
+          tz.transition 2044, 4, :o1, 14806249, 6
+          tz.transition 2044, 10, :o2, 14807341, 6
+          tz.transition 2045, 4, :o1, 14808433, 6
+          tz.transition 2045, 9, :o2, 14809525, 6
+          tz.transition 2046, 3, :o1, 14810617, 6
+          tz.transition 2046, 10, :o2, 14811751, 6
+          tz.transition 2047, 4, :o1, 14812843, 6
+          tz.transition 2047, 10, :o2, 14813935, 6
+          tz.transition 2048, 4, :o1, 14815027, 6
+          tz.transition 2048, 10, :o2, 14816119, 6
+          tz.transition 2049, 4, :o1, 14817211, 6
+          tz.transition 2049, 10, :o2, 14818303, 6
+          tz.transition 2050, 4, :o1, 14819395, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Melbourne.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Melbourne.rb
new file mode 100644
index 00000000..c1304488
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Melbourne.rb
@@ -0,0 +1,185 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Australia
+      module Melbourne
+        include TimezoneDefinition
+        
+        timezone 'Australia/Melbourne' do |tz|
+          tz.offset :o0, 34792, 0, :LMT
+          tz.offset :o1, 36000, 0, :EST
+          tz.offset :o2, 36000, 3600, :EST
+          
+          tz.transition 1895, 1, :o1, 26062831051, 10800
+          tz.transition 1916, 12, :o2, 3486569881, 1440
+          tz.transition 1917, 3, :o1, 19370497, 8
+          tz.transition 1941, 12, :o2, 14582161, 6
+          tz.transition 1942, 3, :o1, 19443577, 8
+          tz.transition 1942, 9, :o2, 14583775, 6
+          tz.transition 1943, 3, :o1, 19446489, 8
+          tz.transition 1943, 10, :o2, 14586001, 6
+          tz.transition 1944, 3, :o1, 19449401, 8
+          tz.transition 1971, 10, :o2, 57686400
+          tz.transition 1972, 2, :o1, 67968000
+          tz.transition 1972, 10, :o2, 89136000
+          tz.transition 1973, 3, :o1, 100022400
+          tz.transition 1973, 10, :o2, 120585600
+          tz.transition 1974, 3, :o1, 131472000
+          tz.transition 1974, 10, :o2, 152035200
+          tz.transition 1975, 3, :o1, 162921600
+          tz.transition 1975, 10, :o2, 183484800
+          tz.transition 1976, 3, :o1, 194976000
+          tz.transition 1976, 10, :o2, 215539200
+          tz.transition 1977, 3, :o1, 226425600
+          tz.transition 1977, 10, :o2, 246988800
+          tz.transition 1978, 3, :o1, 257875200
+          tz.transition 1978, 10, :o2, 278438400
+          tz.transition 1979, 3, :o1, 289324800
+          tz.transition 1979, 10, :o2, 309888000
+          tz.transition 1980, 3, :o1, 320774400
+          tz.transition 1980, 10, :o2, 341337600
+          tz.transition 1981, 2, :o1, 352224000
+          tz.transition 1981, 10, :o2, 372787200
+          tz.transition 1982, 3, :o1, 384278400
+          tz.transition 1982, 10, :o2, 404841600
+          tz.transition 1983, 3, :o1, 415728000
+          tz.transition 1983, 10, :o2, 436291200
+          tz.transition 1984, 3, :o1, 447177600
+          tz.transition 1984, 10, :o2, 467740800
+          tz.transition 1985, 3, :o1, 478627200
+          tz.transition 1985, 10, :o2, 499190400
+          tz.transition 1986, 3, :o1, 511286400
+          tz.transition 1986, 10, :o2, 530035200
+          tz.transition 1987, 3, :o1, 542736000
+          tz.transition 1987, 10, :o2, 561484800
+          tz.transition 1988, 3, :o1, 574790400
+          tz.transition 1988, 10, :o2, 594144000
+          tz.transition 1989, 3, :o1, 606240000
+          tz.transition 1989, 10, :o2, 625593600
+          tz.transition 1990, 3, :o1, 637689600
+          tz.transition 1990, 10, :o2, 657043200
+          tz.transition 1991, 3, :o1, 667929600
+          tz.transition 1991, 10, :o2, 688492800
+          tz.transition 1992, 2, :o1, 699379200
+          tz.transition 1992, 10, :o2, 719942400
+          tz.transition 1993, 3, :o1, 731433600
+          tz.transition 1993, 10, :o2, 751996800
+          tz.transition 1994, 3, :o1, 762883200
+          tz.transition 1994, 10, :o2, 783446400
+          tz.transition 1995, 3, :o1, 796147200
+          tz.transition 1995, 10, :o2, 814896000
+          tz.transition 1996, 3, :o1, 828201600
+          tz.transition 1996, 10, :o2, 846345600
+          tz.transition 1997, 3, :o1, 859651200
+          tz.transition 1997, 10, :o2, 877795200
+          tz.transition 1998, 3, :o1, 891100800
+          tz.transition 1998, 10, :o2, 909244800
+          tz.transition 1999, 3, :o1, 922550400
+          tz.transition 1999, 10, :o2, 941299200
+          tz.transition 2000, 3, :o1, 954000000
+          tz.transition 2000, 8, :o2, 967305600
+          tz.transition 2001, 3, :o1, 985449600
+          tz.transition 2001, 10, :o2, 1004198400
+          tz.transition 2002, 3, :o1, 1017504000
+          tz.transition 2002, 10, :o2, 1035648000
+          tz.transition 2003, 3, :o1, 1048953600
+          tz.transition 2003, 10, :o2, 1067097600
+          tz.transition 2004, 3, :o1, 1080403200
+          tz.transition 2004, 10, :o2, 1099152000
+          tz.transition 2005, 3, :o1, 1111852800
+          tz.transition 2005, 10, :o2, 1130601600
+          tz.transition 2006, 4, :o1, 1143907200
+          tz.transition 2006, 10, :o2, 1162051200
+          tz.transition 2007, 3, :o1, 1174752000
+          tz.transition 2007, 10, :o2, 1193500800
+          tz.transition 2008, 4, :o1, 1207411200
+          tz.transition 2008, 10, :o2, 1223136000
+          tz.transition 2009, 4, :o1, 1238860800
+          tz.transition 2009, 10, :o2, 1254585600
+          tz.transition 2010, 4, :o1, 1270310400
+          tz.transition 2010, 10, :o2, 1286035200
+          tz.transition 2011, 4, :o1, 1301760000
+          tz.transition 2011, 10, :o2, 1317484800
+          tz.transition 2012, 3, :o1, 1333209600
+          tz.transition 2012, 10, :o2, 1349539200
+          tz.transition 2013, 4, :o1, 1365264000
+          tz.transition 2013, 10, :o2, 1380988800
+          tz.transition 2014, 4, :o1, 1396713600
+          tz.transition 2014, 10, :o2, 1412438400
+          tz.transition 2015, 4, :o1, 1428163200
+          tz.transition 2015, 10, :o2, 1443888000
+          tz.transition 2016, 4, :o1, 1459612800
+          tz.transition 2016, 10, :o2, 1475337600
+          tz.transition 2017, 4, :o1, 1491062400
+          tz.transition 2017, 9, :o2, 1506787200
+          tz.transition 2018, 3, :o1, 1522512000
+          tz.transition 2018, 10, :o2, 1538841600
+          tz.transition 2019, 4, :o1, 1554566400
+          tz.transition 2019, 10, :o2, 1570291200
+          tz.transition 2020, 4, :o1, 1586016000
+          tz.transition 2020, 10, :o2, 1601740800
+          tz.transition 2021, 4, :o1, 1617465600
+          tz.transition 2021, 10, :o2, 1633190400
+          tz.transition 2022, 4, :o1, 1648915200
+          tz.transition 2022, 10, :o2, 1664640000
+          tz.transition 2023, 4, :o1, 1680364800
+          tz.transition 2023, 9, :o2, 1696089600
+          tz.transition 2024, 4, :o1, 1712419200
+          tz.transition 2024, 10, :o2, 1728144000
+          tz.transition 2025, 4, :o1, 1743868800
+          tz.transition 2025, 10, :o2, 1759593600
+          tz.transition 2026, 4, :o1, 1775318400
+          tz.transition 2026, 10, :o2, 1791043200
+          tz.transition 2027, 4, :o1, 1806768000
+          tz.transition 2027, 10, :o2, 1822492800
+          tz.transition 2028, 4, :o1, 1838217600
+          tz.transition 2028, 9, :o2, 1853942400
+          tz.transition 2029, 3, :o1, 1869667200
+          tz.transition 2029, 10, :o2, 1885996800
+          tz.transition 2030, 4, :o1, 1901721600
+          tz.transition 2030, 10, :o2, 1917446400
+          tz.transition 2031, 4, :o1, 1933171200
+          tz.transition 2031, 10, :o2, 1948896000
+          tz.transition 2032, 4, :o1, 1964620800
+          tz.transition 2032, 10, :o2, 1980345600
+          tz.transition 2033, 4, :o1, 1996070400
+          tz.transition 2033, 10, :o2, 2011795200
+          tz.transition 2034, 4, :o1, 2027520000
+          tz.transition 2034, 9, :o2, 2043244800
+          tz.transition 2035, 3, :o1, 2058969600
+          tz.transition 2035, 10, :o2, 2075299200
+          tz.transition 2036, 4, :o1, 2091024000
+          tz.transition 2036, 10, :o2, 2106748800
+          tz.transition 2037, 4, :o1, 2122473600
+          tz.transition 2037, 10, :o2, 2138198400
+          tz.transition 2038, 4, :o1, 14793103, 6
+          tz.transition 2038, 10, :o2, 14794195, 6
+          tz.transition 2039, 4, :o1, 14795287, 6
+          tz.transition 2039, 10, :o2, 14796379, 6
+          tz.transition 2040, 3, :o1, 14797471, 6
+          tz.transition 2040, 10, :o2, 14798605, 6
+          tz.transition 2041, 4, :o1, 14799697, 6
+          tz.transition 2041, 10, :o2, 14800789, 6
+          tz.transition 2042, 4, :o1, 14801881, 6
+          tz.transition 2042, 10, :o2, 14802973, 6
+          tz.transition 2043, 4, :o1, 14804065, 6
+          tz.transition 2043, 10, :o2, 14805157, 6
+          tz.transition 2044, 4, :o1, 14806249, 6
+          tz.transition 2044, 10, :o2, 14807341, 6
+          tz.transition 2045, 4, :o1, 14808433, 6
+          tz.transition 2045, 9, :o2, 14809525, 6
+          tz.transition 2046, 3, :o1, 14810617, 6
+          tz.transition 2046, 10, :o2, 14811751, 6
+          tz.transition 2047, 4, :o1, 14812843, 6
+          tz.transition 2047, 10, :o2, 14813935, 6
+          tz.transition 2048, 4, :o1, 14815027, 6
+          tz.transition 2048, 10, :o2, 14816119, 6
+          tz.transition 2049, 4, :o1, 14817211, 6
+          tz.transition 2049, 10, :o2, 14818303, 6
+          tz.transition 2050, 4, :o1, 14819395, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Perth.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Perth.rb
new file mode 100644
index 00000000..d9e66f14
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Perth.rb
@@ -0,0 +1,37 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Australia
+      module Perth
+        include TimezoneDefinition
+        
+        timezone 'Australia/Perth' do |tz|
+          tz.offset :o0, 27804, 0, :LMT
+          tz.offset :o1, 28800, 0, :WST
+          tz.offset :o2, 28800, 3600, :WST
+          
+          tz.transition 1895, 11, :o1, 17377402883, 7200
+          tz.transition 1916, 12, :o2, 3486570001, 1440
+          tz.transition 1917, 3, :o1, 58111493, 24
+          tz.transition 1941, 12, :o2, 9721441, 4
+          tz.transition 1942, 3, :o1, 58330733, 24
+          tz.transition 1942, 9, :o2, 9722517, 4
+          tz.transition 1943, 3, :o1, 58339469, 24
+          tz.transition 1974, 10, :o2, 152042400
+          tz.transition 1975, 3, :o1, 162928800
+          tz.transition 1983, 10, :o2, 436298400
+          tz.transition 1984, 3, :o1, 447184800
+          tz.transition 1991, 11, :o2, 690314400
+          tz.transition 1992, 2, :o1, 699386400
+          tz.transition 2006, 12, :o2, 1165082400
+          tz.transition 2007, 3, :o1, 1174759200
+          tz.transition 2007, 10, :o2, 1193508000
+          tz.transition 2008, 3, :o1, 1206813600
+          tz.transition 2008, 10, :o2, 1224957600
+          tz.transition 2009, 3, :o1, 1238263200
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Sydney.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Sydney.rb
new file mode 100644
index 00000000..9062bd7c
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Sydney.rb
@@ -0,0 +1,185 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Australia
+      module Sydney
+        include TimezoneDefinition
+        
+        timezone 'Australia/Sydney' do |tz|
+          tz.offset :o0, 36292, 0, :LMT
+          tz.offset :o1, 36000, 0, :EST
+          tz.offset :o2, 36000, 3600, :EST
+          
+          tz.transition 1895, 1, :o1, 52125661727, 21600
+          tz.transition 1916, 12, :o2, 3486569881, 1440
+          tz.transition 1917, 3, :o1, 19370497, 8
+          tz.transition 1941, 12, :o2, 14582161, 6
+          tz.transition 1942, 3, :o1, 19443577, 8
+          tz.transition 1942, 9, :o2, 14583775, 6
+          tz.transition 1943, 3, :o1, 19446489, 8
+          tz.transition 1943, 10, :o2, 14586001, 6
+          tz.transition 1944, 3, :o1, 19449401, 8
+          tz.transition 1971, 10, :o2, 57686400
+          tz.transition 1972, 2, :o1, 67968000
+          tz.transition 1972, 10, :o2, 89136000
+          tz.transition 1973, 3, :o1, 100022400
+          tz.transition 1973, 10, :o2, 120585600
+          tz.transition 1974, 3, :o1, 131472000
+          tz.transition 1974, 10, :o2, 152035200
+          tz.transition 1975, 3, :o1, 162921600
+          tz.transition 1975, 10, :o2, 183484800
+          tz.transition 1976, 3, :o1, 194976000
+          tz.transition 1976, 10, :o2, 215539200
+          tz.transition 1977, 3, :o1, 226425600
+          tz.transition 1977, 10, :o2, 246988800
+          tz.transition 1978, 3, :o1, 257875200
+          tz.transition 1978, 10, :o2, 278438400
+          tz.transition 1979, 3, :o1, 289324800
+          tz.transition 1979, 10, :o2, 309888000
+          tz.transition 1980, 3, :o1, 320774400
+          tz.transition 1980, 10, :o2, 341337600
+          tz.transition 1981, 2, :o1, 352224000
+          tz.transition 1981, 10, :o2, 372787200
+          tz.transition 1982, 4, :o1, 386697600
+          tz.transition 1982, 10, :o2, 404841600
+          tz.transition 1983, 3, :o1, 415728000
+          tz.transition 1983, 10, :o2, 436291200
+          tz.transition 1984, 3, :o1, 447177600
+          tz.transition 1984, 10, :o2, 467740800
+          tz.transition 1985, 3, :o1, 478627200
+          tz.transition 1985, 10, :o2, 499190400
+          tz.transition 1986, 3, :o1, 511286400
+          tz.transition 1986, 10, :o2, 530035200
+          tz.transition 1987, 3, :o1, 542736000
+          tz.transition 1987, 10, :o2, 562089600
+          tz.transition 1988, 3, :o1, 574790400
+          tz.transition 1988, 10, :o2, 594144000
+          tz.transition 1989, 3, :o1, 606240000
+          tz.transition 1989, 10, :o2, 625593600
+          tz.transition 1990, 3, :o1, 636480000
+          tz.transition 1990, 10, :o2, 657043200
+          tz.transition 1991, 3, :o1, 667929600
+          tz.transition 1991, 10, :o2, 688492800
+          tz.transition 1992, 2, :o1, 699379200
+          tz.transition 1992, 10, :o2, 719942400
+          tz.transition 1993, 3, :o1, 731433600
+          tz.transition 1993, 10, :o2, 751996800
+          tz.transition 1994, 3, :o1, 762883200
+          tz.transition 1994, 10, :o2, 783446400
+          tz.transition 1995, 3, :o1, 794332800
+          tz.transition 1995, 10, :o2, 814896000
+          tz.transition 1996, 3, :o1, 828201600
+          tz.transition 1996, 10, :o2, 846345600
+          tz.transition 1997, 3, :o1, 859651200
+          tz.transition 1997, 10, :o2, 877795200
+          tz.transition 1998, 3, :o1, 891100800
+          tz.transition 1998, 10, :o2, 909244800
+          tz.transition 1999, 3, :o1, 922550400
+          tz.transition 1999, 10, :o2, 941299200
+          tz.transition 2000, 3, :o1, 954000000
+          tz.transition 2000, 8, :o2, 967305600
+          tz.transition 2001, 3, :o1, 985449600
+          tz.transition 2001, 10, :o2, 1004198400
+          tz.transition 2002, 3, :o1, 1017504000
+          tz.transition 2002, 10, :o2, 1035648000
+          tz.transition 2003, 3, :o1, 1048953600
+          tz.transition 2003, 10, :o2, 1067097600
+          tz.transition 2004, 3, :o1, 1080403200
+          tz.transition 2004, 10, :o2, 1099152000
+          tz.transition 2005, 3, :o1, 1111852800
+          tz.transition 2005, 10, :o2, 1130601600
+          tz.transition 2006, 4, :o1, 1143907200
+          tz.transition 2006, 10, :o2, 1162051200
+          tz.transition 2007, 3, :o1, 1174752000
+          tz.transition 2007, 10, :o2, 1193500800
+          tz.transition 2008, 4, :o1, 1207411200
+          tz.transition 2008, 10, :o2, 1223136000
+          tz.transition 2009, 4, :o1, 1238860800
+          tz.transition 2009, 10, :o2, 1254585600
+          tz.transition 2010, 4, :o1, 1270310400
+          tz.transition 2010, 10, :o2, 1286035200
+          tz.transition 2011, 4, :o1, 1301760000
+          tz.transition 2011, 10, :o2, 1317484800
+          tz.transition 2012, 3, :o1, 1333209600
+          tz.transition 2012, 10, :o2, 1349539200
+          tz.transition 2013, 4, :o1, 1365264000
+          tz.transition 2013, 10, :o2, 1380988800
+          tz.transition 2014, 4, :o1, 1396713600
+          tz.transition 2014, 10, :o2, 1412438400
+          tz.transition 2015, 4, :o1, 1428163200
+          tz.transition 2015, 10, :o2, 1443888000
+          tz.transition 2016, 4, :o1, 1459612800
+          tz.transition 2016, 10, :o2, 1475337600
+          tz.transition 2017, 4, :o1, 1491062400
+          tz.transition 2017, 9, :o2, 1506787200
+          tz.transition 2018, 3, :o1, 1522512000
+          tz.transition 2018, 10, :o2, 1538841600
+          tz.transition 2019, 4, :o1, 1554566400
+          tz.transition 2019, 10, :o2, 1570291200
+          tz.transition 2020, 4, :o1, 1586016000
+          tz.transition 2020, 10, :o2, 1601740800
+          tz.transition 2021, 4, :o1, 1617465600
+          tz.transition 2021, 10, :o2, 1633190400
+          tz.transition 2022, 4, :o1, 1648915200
+          tz.transition 2022, 10, :o2, 1664640000
+          tz.transition 2023, 4, :o1, 1680364800
+          tz.transition 2023, 9, :o2, 1696089600
+          tz.transition 2024, 4, :o1, 1712419200
+          tz.transition 2024, 10, :o2, 1728144000
+          tz.transition 2025, 4, :o1, 1743868800
+          tz.transition 2025, 10, :o2, 1759593600
+          tz.transition 2026, 4, :o1, 1775318400
+          tz.transition 2026, 10, :o2, 1791043200
+          tz.transition 2027, 4, :o1, 1806768000
+          tz.transition 2027, 10, :o2, 1822492800
+          tz.transition 2028, 4, :o1, 1838217600
+          tz.transition 2028, 9, :o2, 1853942400
+          tz.transition 2029, 3, :o1, 1869667200
+          tz.transition 2029, 10, :o2, 1885996800
+          tz.transition 2030, 4, :o1, 1901721600
+          tz.transition 2030, 10, :o2, 1917446400
+          tz.transition 2031, 4, :o1, 1933171200
+          tz.transition 2031, 10, :o2, 1948896000
+          tz.transition 2032, 4, :o1, 1964620800
+          tz.transition 2032, 10, :o2, 1980345600
+          tz.transition 2033, 4, :o1, 1996070400
+          tz.transition 2033, 10, :o2, 2011795200
+          tz.transition 2034, 4, :o1, 2027520000
+          tz.transition 2034, 9, :o2, 2043244800
+          tz.transition 2035, 3, :o1, 2058969600
+          tz.transition 2035, 10, :o2, 2075299200
+          tz.transition 2036, 4, :o1, 2091024000
+          tz.transition 2036, 10, :o2, 2106748800
+          tz.transition 2037, 4, :o1, 2122473600
+          tz.transition 2037, 10, :o2, 2138198400
+          tz.transition 2038, 4, :o1, 14793103, 6
+          tz.transition 2038, 10, :o2, 14794195, 6
+          tz.transition 2039, 4, :o1, 14795287, 6
+          tz.transition 2039, 10, :o2, 14796379, 6
+          tz.transition 2040, 3, :o1, 14797471, 6
+          tz.transition 2040, 10, :o2, 14798605, 6
+          tz.transition 2041, 4, :o1, 14799697, 6
+          tz.transition 2041, 10, :o2, 14800789, 6
+          tz.transition 2042, 4, :o1, 14801881, 6
+          tz.transition 2042, 10, :o2, 14802973, 6
+          tz.transition 2043, 4, :o1, 14804065, 6
+          tz.transition 2043, 10, :o2, 14805157, 6
+          tz.transition 2044, 4, :o1, 14806249, 6
+          tz.transition 2044, 10, :o2, 14807341, 6
+          tz.transition 2045, 4, :o1, 14808433, 6
+          tz.transition 2045, 9, :o2, 14809525, 6
+          tz.transition 2046, 3, :o1, 14810617, 6
+          tz.transition 2046, 10, :o2, 14811751, 6
+          tz.transition 2047, 4, :o1, 14812843, 6
+          tz.transition 2047, 10, :o2, 14813935, 6
+          tz.transition 2048, 4, :o1, 14815027, 6
+          tz.transition 2048, 10, :o2, 14816119, 6
+          tz.transition 2049, 4, :o1, 14817211, 6
+          tz.transition 2049, 10, :o2, 14818303, 6
+          tz.transition 2050, 4, :o1, 14819395, 6
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Etc/UTC.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Etc/UTC.rb
new file mode 100644
index 00000000..28b2c6a0
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Etc/UTC.rb
@@ -0,0 +1,16 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Etc
+      module UTC
+        include TimezoneDefinition
+        
+        timezone 'Etc/UTC' do |tz|
+          tz.offset :o0, 0, 0, :UTC
+          
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Amsterdam.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Amsterdam.rb
new file mode 100644
index 00000000..2d0c95c4
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Amsterdam.rb
@@ -0,0 +1,228 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Amsterdam
+        include TimezoneDefinition
+        
+        timezone 'Europe/Amsterdam' do |tz|
+          tz.offset :o0, 1172, 0, :LMT
+          tz.offset :o1, 1172, 0, :AMT
+          tz.offset :o2, 1172, 3600, :NST
+          tz.offset :o3, 1200, 3600, :NEST
+          tz.offset :o4, 1200, 0, :NET
+          tz.offset :o5, 3600, 3600, :CEST
+          tz.offset :o6, 3600, 0, :CET
+          
+          tz.transition 1834, 12, :o1, 51651636907, 21600
+          tz.transition 1916, 4, :o2, 52293264907, 21600
+          tz.transition 1916, 9, :o1, 52296568807, 21600
+          tz.transition 1917, 4, :o2, 52300826707, 21600
+          tz.transition 1917, 9, :o1, 52304153107, 21600
+          tz.transition 1918, 4, :o2, 52308386707, 21600
+          tz.transition 1918, 9, :o1, 52312317907, 21600
+          tz.transition 1919, 4, :o2, 52316400307, 21600
+          tz.transition 1919, 9, :o1, 52320180307, 21600
+          tz.transition 1920, 4, :o2, 52324262707, 21600
+          tz.transition 1920, 9, :o1, 52328042707, 21600
+          tz.transition 1921, 4, :o2, 52332125107, 21600
+          tz.transition 1921, 9, :o1, 52335905107, 21600
+          tz.transition 1922, 3, :o2, 52339814707, 21600
+          tz.transition 1922, 10, :o1, 52344048307, 21600
+          tz.transition 1923, 6, :o2, 52349145907, 21600
+          tz.transition 1923, 10, :o1, 52351910707, 21600
+          tz.transition 1924, 3, :o2, 52355690707, 21600
+          tz.transition 1924, 10, :o1, 52359773107, 21600
+          tz.transition 1925, 6, :o2, 52365021907, 21600
+          tz.transition 1925, 10, :o1, 52367635507, 21600
+          tz.transition 1926, 5, :o2, 52372452307, 21600
+          tz.transition 1926, 10, :o1, 52375497907, 21600
+          tz.transition 1927, 5, :o2, 52380336307, 21600
+          tz.transition 1927, 10, :o1, 52383360307, 21600
+          tz.transition 1928, 5, :o2, 52388241907, 21600
+          tz.transition 1928, 10, :o1, 52391373907, 21600
+          tz.transition 1929, 5, :o2, 52396125907, 21600
+          tz.transition 1929, 10, :o1, 52399236307, 21600
+          tz.transition 1930, 5, :o2, 52404009907, 21600
+          tz.transition 1930, 10, :o1, 52407098707, 21600
+          tz.transition 1931, 5, :o2, 52411893907, 21600
+          tz.transition 1931, 10, :o1, 52414961107, 21600
+          tz.transition 1932, 5, :o2, 52419950707, 21600
+          tz.transition 1932, 10, :o1, 52422823507, 21600
+          tz.transition 1933, 5, :o2, 52427683507, 21600
+          tz.transition 1933, 10, :o1, 52430837107, 21600
+          tz.transition 1934, 5, :o2, 52435567507, 21600
+          tz.transition 1934, 10, :o1, 52438699507, 21600
+          tz.transition 1935, 5, :o2, 52443451507, 21600
+          tz.transition 1935, 10, :o1, 52446561907, 21600
+          tz.transition 1936, 5, :o2, 52451357107, 21600
+          tz.transition 1936, 10, :o1, 52454424307, 21600
+          tz.transition 1937, 5, :o2, 52459392307, 21600
+          tz.transition 1937, 6, :o3, 52460253607, 21600
+          tz.transition 1937, 10, :o4, 174874289, 72
+          tz.transition 1938, 5, :o3, 174890417, 72
+          tz.transition 1938, 10, :o4, 174900497, 72
+          tz.transition 1939, 5, :o3, 174916697, 72
+          tz.transition 1939, 10, :o4, 174927209, 72
+          tz.transition 1940, 5, :o5, 174943115, 72
+          tz.transition 1942, 11, :o6, 58335973, 24
+          tz.transition 1943, 3, :o5, 58339501, 24
+          tz.transition 1943, 10, :o6, 58344037, 24
+          tz.transition 1944, 4, :o5, 58348405, 24
+          tz.transition 1944, 10, :o6, 58352773, 24
+          tz.transition 1945, 4, :o5, 58357141, 24
+          tz.transition 1945, 9, :o6, 58361149, 24
+          tz.transition 1977, 4, :o5, 228877200
+          tz.transition 1977, 9, :o6, 243997200
+          tz.transition 1978, 4, :o5, 260326800
+          tz.transition 1978, 10, :o6, 276051600
+          tz.transition 1979, 4, :o5, 291776400
+          tz.transition 1979, 9, :o6, 307501200
+          tz.transition 1980, 4, :o5, 323830800
+          tz.transition 1980, 9, :o6, 338950800
+          tz.transition 1981, 3, :o5, 354675600
+          tz.transition 1981, 9, :o6, 370400400
+          tz.transition 1982, 3, :o5, 386125200
+          tz.transition 1982, 9, :o6, 401850000
+          tz.transition 1983, 3, :o5, 417574800
+          tz.transition 1983, 9, :o6, 433299600
+          tz.transition 1984, 3, :o5, 449024400
+          tz.transition 1984, 9, :o6, 465354000
+          tz.transition 1985, 3, :o5, 481078800
+          tz.transition 1985, 9, :o6, 496803600
+          tz.transition 1986, 3, :o5, 512528400
+          tz.transition 1986, 9, :o6, 528253200
+          tz.transition 1987, 3, :o5, 543978000
+          tz.transition 1987, 9, :o6, 559702800
+          tz.transition 1988, 3, :o5, 575427600
+          tz.transition 1988, 9, :o6, 591152400
+          tz.transition 1989, 3, :o5, 606877200
+          tz.transition 1989, 9, :o6, 622602000
+          tz.transition 1990, 3, :o5, 638326800
+          tz.transition 1990, 9, :o6, 654656400
+          tz.transition 1991, 3, :o5, 670381200
+          tz.transition 1991, 9, :o6, 686106000
+          tz.transition 1992, 3, :o5, 701830800
+          tz.transition 1992, 9, :o6, 717555600
+          tz.transition 1993, 3, :o5, 733280400
+          tz.transition 1993, 9, :o6, 749005200
+          tz.transition 1994, 3, :o5, 764730000
+          tz.transition 1994, 9, :o6, 780454800
+          tz.transition 1995, 3, :o5, 796179600
+          tz.transition 1995, 9, :o6, 811904400
+          tz.transition 1996, 3, :o5, 828234000
+          tz.transition 1996, 10, :o6, 846378000
+          tz.transition 1997, 3, :o5, 859683600
+          tz.transition 1997, 10, :o6, 877827600
+          tz.transition 1998, 3, :o5, 891133200
+          tz.transition 1998, 10, :o6, 909277200
+          tz.transition 1999, 3, :o5, 922582800
+          tz.transition 1999, 10, :o6, 941331600
+          tz.transition 2000, 3, :o5, 954032400
+          tz.transition 2000, 10, :o6, 972781200
+          tz.transition 2001, 3, :o5, 985482000
+          tz.transition 2001, 10, :o6, 1004230800
+          tz.transition 2002, 3, :o5, 1017536400
+          tz.transition 2002, 10, :o6, 1035680400
+          tz.transition 2003, 3, :o5, 1048986000
+          tz.transition 2003, 10, :o6, 1067130000
+          tz.transition 2004, 3, :o5, 1080435600
+          tz.transition 2004, 10, :o6, 1099184400
+          tz.transition 2005, 3, :o5, 1111885200
+          tz.transition 2005, 10, :o6, 1130634000
+          tz.transition 2006, 3, :o5, 1143334800
+          tz.transition 2006, 10, :o6, 1162083600
+          tz.transition 2007, 3, :o5, 1174784400
+          tz.transition 2007, 10, :o6, 1193533200
+          tz.transition 2008, 3, :o5, 1206838800
+          tz.transition 2008, 10, :o6, 1224982800
+          tz.transition 2009, 3, :o5, 1238288400
+          tz.transition 2009, 10, :o6, 1256432400
+          tz.transition 2010, 3, :o5, 1269738000
+          tz.transition 2010, 10, :o6, 1288486800
+          tz.transition 2011, 3, :o5, 1301187600
+          tz.transition 2011, 10, :o6, 1319936400
+          tz.transition 2012, 3, :o5, 1332637200
+          tz.transition 2012, 10, :o6, 1351386000
+          tz.transition 2013, 3, :o5, 1364691600
+          tz.transition 2013, 10, :o6, 1382835600
+          tz.transition 2014, 3, :o5, 1396141200
+          tz.transition 2014, 10, :o6, 1414285200
+          tz.transition 2015, 3, :o5, 1427590800
+          tz.transition 2015, 10, :o6, 1445734800
+          tz.transition 2016, 3, :o5, 1459040400
+          tz.transition 2016, 10, :o6, 1477789200
+          tz.transition 2017, 3, :o5, 1490490000
+          tz.transition 2017, 10, :o6, 1509238800
+          tz.transition 2018, 3, :o5, 1521939600
+          tz.transition 2018, 10, :o6, 1540688400
+          tz.transition 2019, 3, :o5, 1553994000
+          tz.transition 2019, 10, :o6, 1572138000
+          tz.transition 2020, 3, :o5, 1585443600
+          tz.transition 2020, 10, :o6, 1603587600
+          tz.transition 2021, 3, :o5, 1616893200
+          tz.transition 2021, 10, :o6, 1635642000
+          tz.transition 2022, 3, :o5, 1648342800
+          tz.transition 2022, 10, :o6, 1667091600
+          tz.transition 2023, 3, :o5, 1679792400
+          tz.transition 2023, 10, :o6, 1698541200
+          tz.transition 2024, 3, :o5, 1711846800
+          tz.transition 2024, 10, :o6, 1729990800
+          tz.transition 2025, 3, :o5, 1743296400
+          tz.transition 2025, 10, :o6, 1761440400
+          tz.transition 2026, 3, :o5, 1774746000
+          tz.transition 2026, 10, :o6, 1792890000
+          tz.transition 2027, 3, :o5, 1806195600
+          tz.transition 2027, 10, :o6, 1824944400
+          tz.transition 2028, 3, :o5, 1837645200
+          tz.transition 2028, 10, :o6, 1856394000
+          tz.transition 2029, 3, :o5, 1869094800
+          tz.transition 2029, 10, :o6, 1887843600
+          tz.transition 2030, 3, :o5, 1901149200
+          tz.transition 2030, 10, :o6, 1919293200
+          tz.transition 2031, 3, :o5, 1932598800
+          tz.transition 2031, 10, :o6, 1950742800
+          tz.transition 2032, 3, :o5, 1964048400
+          tz.transition 2032, 10, :o6, 1982797200
+          tz.transition 2033, 3, :o5, 1995498000
+          tz.transition 2033, 10, :o6, 2014246800
+          tz.transition 2034, 3, :o5, 2026947600
+          tz.transition 2034, 10, :o6, 2045696400
+          tz.transition 2035, 3, :o5, 2058397200
+          tz.transition 2035, 10, :o6, 2077146000
+          tz.transition 2036, 3, :o5, 2090451600
+          tz.transition 2036, 10, :o6, 2108595600
+          tz.transition 2037, 3, :o5, 2121901200
+          tz.transition 2037, 10, :o6, 2140045200
+          tz.transition 2038, 3, :o5, 59172253, 24
+          tz.transition 2038, 10, :o6, 59177461, 24
+          tz.transition 2039, 3, :o5, 59180989, 24
+          tz.transition 2039, 10, :o6, 59186197, 24
+          tz.transition 2040, 3, :o5, 59189725, 24
+          tz.transition 2040, 10, :o6, 59194933, 24
+          tz.transition 2041, 3, :o5, 59198629, 24
+          tz.transition 2041, 10, :o6, 59203669, 24
+          tz.transition 2042, 3, :o5, 59207365, 24
+          tz.transition 2042, 10, :o6, 59212405, 24
+          tz.transition 2043, 3, :o5, 59216101, 24
+          tz.transition 2043, 10, :o6, 59221141, 24
+          tz.transition 2044, 3, :o5, 59224837, 24
+          tz.transition 2044, 10, :o6, 59230045, 24
+          tz.transition 2045, 3, :o5, 59233573, 24
+          tz.transition 2045, 10, :o6, 59238781, 24
+          tz.transition 2046, 3, :o5, 59242309, 24
+          tz.transition 2046, 10, :o6, 59247517, 24
+          tz.transition 2047, 3, :o5, 59251213, 24
+          tz.transition 2047, 10, :o6, 59256253, 24
+          tz.transition 2048, 3, :o5, 59259949, 24
+          tz.transition 2048, 10, :o6, 59264989, 24
+          tz.transition 2049, 3, :o5, 59268685, 24
+          tz.transition 2049, 10, :o6, 59273893, 24
+          tz.transition 2050, 3, :o5, 59277421, 24
+          tz.transition 2050, 10, :o6, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Athens.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Athens.rb
new file mode 100644
index 00000000..4e21e535
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Athens.rb
@@ -0,0 +1,185 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Athens
+        include TimezoneDefinition
+        
+        timezone 'Europe/Athens' do |tz|
+          tz.offset :o0, 5692, 0, :LMT
+          tz.offset :o1, 5692, 0, :AMT
+          tz.offset :o2, 7200, 0, :EET
+          tz.offset :o3, 7200, 3600, :EEST
+          tz.offset :o4, 3600, 3600, :CEST
+          tz.offset :o5, 3600, 0, :CET
+          
+          tz.transition 1895, 9, :o1, 52130529377, 21600
+          tz.transition 1916, 7, :o2, 3268447787, 1350
+          tz.transition 1932, 7, :o3, 29122745, 12
+          tz.transition 1932, 8, :o2, 19415611, 8
+          tz.transition 1941, 4, :o3, 29161097, 12
+          tz.transition 1941, 4, :o4, 19440915, 8
+          tz.transition 1942, 11, :o5, 58335973, 24
+          tz.transition 1943, 3, :o4, 58339523, 24
+          tz.transition 1943, 10, :o5, 29172017, 12
+          tz.transition 1944, 4, :o2, 58348427, 24
+          tz.transition 1952, 6, :o3, 29210333, 12
+          tz.transition 1952, 11, :o2, 19474547, 8
+          tz.transition 1975, 4, :o3, 166485600
+          tz.transition 1975, 11, :o2, 186184800
+          tz.transition 1976, 4, :o3, 198028800
+          tz.transition 1976, 10, :o2, 213753600
+          tz.transition 1977, 4, :o3, 228873600
+          tz.transition 1977, 9, :o2, 244080000
+          tz.transition 1978, 4, :o3, 260323200
+          tz.transition 1978, 9, :o2, 275446800
+          tz.transition 1979, 4, :o3, 291798000
+          tz.transition 1979, 9, :o2, 307407600
+          tz.transition 1980, 3, :o3, 323388000
+          tz.transition 1980, 9, :o2, 338936400
+          tz.transition 1981, 3, :o3, 354675600
+          tz.transition 1981, 9, :o2, 370400400
+          tz.transition 1982, 3, :o3, 386125200
+          tz.transition 1982, 9, :o2, 401850000
+          tz.transition 1983, 3, :o3, 417574800
+          tz.transition 1983, 9, :o2, 433299600
+          tz.transition 1984, 3, :o3, 449024400
+          tz.transition 1984, 9, :o2, 465354000
+          tz.transition 1985, 3, :o3, 481078800
+          tz.transition 1985, 9, :o2, 496803600
+          tz.transition 1986, 3, :o3, 512528400
+          tz.transition 1986, 9, :o2, 528253200
+          tz.transition 1987, 3, :o3, 543978000
+          tz.transition 1987, 9, :o2, 559702800
+          tz.transition 1988, 3, :o3, 575427600
+          tz.transition 1988, 9, :o2, 591152400
+          tz.transition 1989, 3, :o3, 606877200
+          tz.transition 1989, 9, :o2, 622602000
+          tz.transition 1990, 3, :o3, 638326800
+          tz.transition 1990, 9, :o2, 654656400
+          tz.transition 1991, 3, :o3, 670381200
+          tz.transition 1991, 9, :o2, 686106000
+          tz.transition 1992, 3, :o3, 701830800
+          tz.transition 1992, 9, :o2, 717555600
+          tz.transition 1993, 3, :o3, 733280400
+          tz.transition 1993, 9, :o2, 749005200
+          tz.transition 1994, 3, :o3, 764730000
+          tz.transition 1994, 9, :o2, 780454800
+          tz.transition 1995, 3, :o3, 796179600
+          tz.transition 1995, 9, :o2, 811904400
+          tz.transition 1996, 3, :o3, 828234000
+          tz.transition 1996, 10, :o2, 846378000
+          tz.transition 1997, 3, :o3, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o3, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o3, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o3, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o3, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o3, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o3, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o3, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o3, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o3, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Belgrade.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Belgrade.rb
new file mode 100644
index 00000000..4dbd893d
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Belgrade.rb
@@ -0,0 +1,163 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Belgrade
+        include TimezoneDefinition
+        
+        timezone 'Europe/Belgrade' do |tz|
+          tz.offset :o0, 4920, 0, :LMT
+          tz.offset :o1, 3600, 0, :CET
+          tz.offset :o2, 3600, 3600, :CEST
+          
+          tz.transition 1883, 12, :o1, 1734607039, 720
+          tz.transition 1941, 4, :o2, 29161241, 12
+          tz.transition 1942, 11, :o1, 58335973, 24
+          tz.transition 1943, 3, :o2, 58339501, 24
+          tz.transition 1943, 10, :o1, 58344037, 24
+          tz.transition 1944, 4, :o2, 58348405, 24
+          tz.transition 1944, 10, :o1, 58352773, 24
+          tz.transition 1945, 5, :o2, 58358005, 24
+          tz.transition 1945, 9, :o1, 58361149, 24
+          tz.transition 1983, 3, :o2, 417574800
+          tz.transition 1983, 9, :o1, 433299600
+          tz.transition 1984, 3, :o2, 449024400
+          tz.transition 1984, 9, :o1, 465354000
+          tz.transition 1985, 3, :o2, 481078800
+          tz.transition 1985, 9, :o1, 496803600
+          tz.transition 1986, 3, :o2, 512528400
+          tz.transition 1986, 9, :o1, 528253200
+          tz.transition 1987, 3, :o2, 543978000
+          tz.transition 1987, 9, :o1, 559702800
+          tz.transition 1988, 3, :o2, 575427600
+          tz.transition 1988, 9, :o1, 591152400
+          tz.transition 1989, 3, :o2, 606877200
+          tz.transition 1989, 9, :o1, 622602000
+          tz.transition 1990, 3, :o2, 638326800
+          tz.transition 1990, 9, :o1, 654656400
+          tz.transition 1991, 3, :o2, 670381200
+          tz.transition 1991, 9, :o1, 686106000
+          tz.transition 1992, 3, :o2, 701830800
+          tz.transition 1992, 9, :o1, 717555600
+          tz.transition 1993, 3, :o2, 733280400
+          tz.transition 1993, 9, :o1, 749005200
+          tz.transition 1994, 3, :o2, 764730000
+          tz.transition 1994, 9, :o1, 780454800
+          tz.transition 1995, 3, :o2, 796179600
+          tz.transition 1995, 9, :o1, 811904400
+          tz.transition 1996, 3, :o2, 828234000
+          tz.transition 1996, 10, :o1, 846378000
+          tz.transition 1997, 3, :o2, 859683600
+          tz.transition 1997, 10, :o1, 877827600
+          tz.transition 1998, 3, :o2, 891133200
+          tz.transition 1998, 10, :o1, 909277200
+          tz.transition 1999, 3, :o2, 922582800
+          tz.transition 1999, 10, :o1, 941331600
+          tz.transition 2000, 3, :o2, 954032400
+          tz.transition 2000, 10, :o1, 972781200
+          tz.transition 2001, 3, :o2, 985482000
+          tz.transition 2001, 10, :o1, 1004230800
+          tz.transition 2002, 3, :o2, 1017536400
+          tz.transition 2002, 10, :o1, 1035680400
+          tz.transition 2003, 3, :o2, 1048986000
+          tz.transition 2003, 10, :o1, 1067130000
+          tz.transition 2004, 3, :o2, 1080435600
+          tz.transition 2004, 10, :o1, 1099184400
+          tz.transition 2005, 3, :o2, 1111885200
+          tz.transition 2005, 10, :o1, 1130634000
+          tz.transition 2006, 3, :o2, 1143334800
+          tz.transition 2006, 10, :o1, 1162083600
+          tz.transition 2007, 3, :o2, 1174784400
+          tz.transition 2007, 10, :o1, 1193533200
+          tz.transition 2008, 3, :o2, 1206838800
+          tz.transition 2008, 10, :o1, 1224982800
+          tz.transition 2009, 3, :o2, 1238288400
+          tz.transition 2009, 10, :o1, 1256432400
+          tz.transition 2010, 3, :o2, 1269738000
+          tz.transition 2010, 10, :o1, 1288486800
+          tz.transition 2011, 3, :o2, 1301187600
+          tz.transition 2011, 10, :o1, 1319936400
+          tz.transition 2012, 3, :o2, 1332637200
+          tz.transition 2012, 10, :o1, 1351386000
+          tz.transition 2013, 3, :o2, 1364691600
+          tz.transition 2013, 10, :o1, 1382835600
+          tz.transition 2014, 3, :o2, 1396141200
+          tz.transition 2014, 10, :o1, 1414285200
+          tz.transition 2015, 3, :o2, 1427590800
+          tz.transition 2015, 10, :o1, 1445734800
+          tz.transition 2016, 3, :o2, 1459040400
+          tz.transition 2016, 10, :o1, 1477789200
+          tz.transition 2017, 3, :o2, 1490490000
+          tz.transition 2017, 10, :o1, 1509238800
+          tz.transition 2018, 3, :o2, 1521939600
+          tz.transition 2018, 10, :o1, 1540688400
+          tz.transition 2019, 3, :o2, 1553994000
+          tz.transition 2019, 10, :o1, 1572138000
+          tz.transition 2020, 3, :o2, 1585443600
+          tz.transition 2020, 10, :o1, 1603587600
+          tz.transition 2021, 3, :o2, 1616893200
+          tz.transition 2021, 10, :o1, 1635642000
+          tz.transition 2022, 3, :o2, 1648342800
+          tz.transition 2022, 10, :o1, 1667091600
+          tz.transition 2023, 3, :o2, 1679792400
+          tz.transition 2023, 10, :o1, 1698541200
+          tz.transition 2024, 3, :o2, 1711846800
+          tz.transition 2024, 10, :o1, 1729990800
+          tz.transition 2025, 3, :o2, 1743296400
+          tz.transition 2025, 10, :o1, 1761440400
+          tz.transition 2026, 3, :o2, 1774746000
+          tz.transition 2026, 10, :o1, 1792890000
+          tz.transition 2027, 3, :o2, 1806195600
+          tz.transition 2027, 10, :o1, 1824944400
+          tz.transition 2028, 3, :o2, 1837645200
+          tz.transition 2028, 10, :o1, 1856394000
+          tz.transition 2029, 3, :o2, 1869094800
+          tz.transition 2029, 10, :o1, 1887843600
+          tz.transition 2030, 3, :o2, 1901149200
+          tz.transition 2030, 10, :o1, 1919293200
+          tz.transition 2031, 3, :o2, 1932598800
+          tz.transition 2031, 10, :o1, 1950742800
+          tz.transition 2032, 3, :o2, 1964048400
+          tz.transition 2032, 10, :o1, 1982797200
+          tz.transition 2033, 3, :o2, 1995498000
+          tz.transition 2033, 10, :o1, 2014246800
+          tz.transition 2034, 3, :o2, 2026947600
+          tz.transition 2034, 10, :o1, 2045696400
+          tz.transition 2035, 3, :o2, 2058397200
+          tz.transition 2035, 10, :o1, 2077146000
+          tz.transition 2036, 3, :o2, 2090451600
+          tz.transition 2036, 10, :o1, 2108595600
+          tz.transition 2037, 3, :o2, 2121901200
+          tz.transition 2037, 10, :o1, 2140045200
+          tz.transition 2038, 3, :o2, 59172253, 24
+          tz.transition 2038, 10, :o1, 59177461, 24
+          tz.transition 2039, 3, :o2, 59180989, 24
+          tz.transition 2039, 10, :o1, 59186197, 24
+          tz.transition 2040, 3, :o2, 59189725, 24
+          tz.transition 2040, 10, :o1, 59194933, 24
+          tz.transition 2041, 3, :o2, 59198629, 24
+          tz.transition 2041, 10, :o1, 59203669, 24
+          tz.transition 2042, 3, :o2, 59207365, 24
+          tz.transition 2042, 10, :o1, 59212405, 24
+          tz.transition 2043, 3, :o2, 59216101, 24
+          tz.transition 2043, 10, :o1, 59221141, 24
+          tz.transition 2044, 3, :o2, 59224837, 24
+          tz.transition 2044, 10, :o1, 59230045, 24
+          tz.transition 2045, 3, :o2, 59233573, 24
+          tz.transition 2045, 10, :o1, 59238781, 24
+          tz.transition 2046, 3, :o2, 59242309, 24
+          tz.transition 2046, 10, :o1, 59247517, 24
+          tz.transition 2047, 3, :o2, 59251213, 24
+          tz.transition 2047, 10, :o1, 59256253, 24
+          tz.transition 2048, 3, :o2, 59259949, 24
+          tz.transition 2048, 10, :o1, 59264989, 24
+          tz.transition 2049, 3, :o2, 59268685, 24
+          tz.transition 2049, 10, :o1, 59273893, 24
+          tz.transition 2050, 3, :o2, 59277421, 24
+          tz.transition 2050, 10, :o1, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Berlin.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Berlin.rb
new file mode 100644
index 00000000..de2e4d95
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Berlin.rb
@@ -0,0 +1,188 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Berlin
+        include TimezoneDefinition
+        
+        timezone 'Europe/Berlin' do |tz|
+          tz.offset :o0, 3208, 0, :LMT
+          tz.offset :o1, 3600, 0, :CET
+          tz.offset :o2, 3600, 3600, :CEST
+          tz.offset :o3, 3600, 7200, :CEMT
+          
+          tz.transition 1893, 3, :o1, 26055588199, 10800
+          tz.transition 1916, 4, :o2, 29051813, 12
+          tz.transition 1916, 9, :o1, 58107299, 24
+          tz.transition 1917, 4, :o2, 58112029, 24
+          tz.transition 1917, 9, :o1, 58115725, 24
+          tz.transition 1918, 4, :o2, 58120765, 24
+          tz.transition 1918, 9, :o1, 58124461, 24
+          tz.transition 1940, 4, :o2, 58313293, 24
+          tz.transition 1942, 11, :o1, 58335973, 24
+          tz.transition 1943, 3, :o2, 58339501, 24
+          tz.transition 1943, 10, :o1, 58344037, 24
+          tz.transition 1944, 4, :o2, 58348405, 24
+          tz.transition 1944, 10, :o1, 58352773, 24
+          tz.transition 1945, 4, :o2, 58357141, 24
+          tz.transition 1945, 5, :o3, 4863199, 2
+          tz.transition 1945, 9, :o2, 4863445, 2
+          tz.transition 1945, 11, :o1, 58362661, 24
+          tz.transition 1946, 4, :o2, 58366189, 24
+          tz.transition 1946, 10, :o1, 58370413, 24
+          tz.transition 1947, 4, :o2, 58374757, 24
+          tz.transition 1947, 5, :o3, 58375597, 24
+          tz.transition 1947, 6, :o2, 4864731, 2
+          tz.transition 1947, 10, :o1, 58379125, 24
+          tz.transition 1948, 4, :o2, 58383829, 24
+          tz.transition 1948, 10, :o1, 58387861, 24
+          tz.transition 1949, 4, :o2, 58392397, 24
+          tz.transition 1949, 10, :o1, 58396597, 24
+          tz.transition 1980, 4, :o2, 323830800
+          tz.transition 1980, 9, :o1, 338950800
+          tz.transition 1981, 3, :o2, 354675600
+          tz.transition 1981, 9, :o1, 370400400
+          tz.transition 1982, 3, :o2, 386125200
+          tz.transition 1982, 9, :o1, 401850000
+          tz.transition 1983, 3, :o2, 417574800
+          tz.transition 1983, 9, :o1, 433299600
+          tz.transition 1984, 3, :o2, 449024400
+          tz.transition 1984, 9, :o1, 465354000
+          tz.transition 1985, 3, :o2, 481078800
+          tz.transition 1985, 9, :o1, 496803600
+          tz.transition 1986, 3, :o2, 512528400
+          tz.transition 1986, 9, :o1, 528253200
+          tz.transition 1987, 3, :o2, 543978000
+          tz.transition 1987, 9, :o1, 559702800
+          tz.transition 1988, 3, :o2, 575427600
+          tz.transition 1988, 9, :o1, 591152400
+          tz.transition 1989, 3, :o2, 606877200
+          tz.transition 1989, 9, :o1, 622602000
+          tz.transition 1990, 3, :o2, 638326800
+          tz.transition 1990, 9, :o1, 654656400
+          tz.transition 1991, 3, :o2, 670381200
+          tz.transition 1991, 9, :o1, 686106000
+          tz.transition 1992, 3, :o2, 701830800
+          tz.transition 1992, 9, :o1, 717555600
+          tz.transition 1993, 3, :o2, 733280400
+          tz.transition 1993, 9, :o1, 749005200
+          tz.transition 1994, 3, :o2, 764730000
+          tz.transition 1994, 9, :o1, 780454800
+          tz.transition 1995, 3, :o2, 796179600
+          tz.transition 1995, 9, :o1, 811904400
+          tz.transition 1996, 3, :o2, 828234000
+          tz.transition 1996, 10, :o1, 846378000
+          tz.transition 1997, 3, :o2, 859683600
+          tz.transition 1997, 10, :o1, 877827600
+          tz.transition 1998, 3, :o2, 891133200
+          tz.transition 1998, 10, :o1, 909277200
+          tz.transition 1999, 3, :o2, 922582800
+          tz.transition 1999, 10, :o1, 941331600
+          tz.transition 2000, 3, :o2, 954032400
+          tz.transition 2000, 10, :o1, 972781200
+          tz.transition 2001, 3, :o2, 985482000
+          tz.transition 2001, 10, :o1, 1004230800
+          tz.transition 2002, 3, :o2, 1017536400
+          tz.transition 2002, 10, :o1, 1035680400
+          tz.transition 2003, 3, :o2, 1048986000
+          tz.transition 2003, 10, :o1, 1067130000
+          tz.transition 2004, 3, :o2, 1080435600
+          tz.transition 2004, 10, :o1, 1099184400
+          tz.transition 2005, 3, :o2, 1111885200
+          tz.transition 2005, 10, :o1, 1130634000
+          tz.transition 2006, 3, :o2, 1143334800
+          tz.transition 2006, 10, :o1, 1162083600
+          tz.transition 2007, 3, :o2, 1174784400
+          tz.transition 2007, 10, :o1, 1193533200
+          tz.transition 2008, 3, :o2, 1206838800
+          tz.transition 2008, 10, :o1, 1224982800
+          tz.transition 2009, 3, :o2, 1238288400
+          tz.transition 2009, 10, :o1, 1256432400
+          tz.transition 2010, 3, :o2, 1269738000
+          tz.transition 2010, 10, :o1, 1288486800
+          tz.transition 2011, 3, :o2, 1301187600
+          tz.transition 2011, 10, :o1, 1319936400
+          tz.transition 2012, 3, :o2, 1332637200
+          tz.transition 2012, 10, :o1, 1351386000
+          tz.transition 2013, 3, :o2, 1364691600
+          tz.transition 2013, 10, :o1, 1382835600
+          tz.transition 2014, 3, :o2, 1396141200
+          tz.transition 2014, 10, :o1, 1414285200
+          tz.transition 2015, 3, :o2, 1427590800
+          tz.transition 2015, 10, :o1, 1445734800
+          tz.transition 2016, 3, :o2, 1459040400
+          tz.transition 2016, 10, :o1, 1477789200
+          tz.transition 2017, 3, :o2, 1490490000
+          tz.transition 2017, 10, :o1, 1509238800
+          tz.transition 2018, 3, :o2, 1521939600
+          tz.transition 2018, 10, :o1, 1540688400
+          tz.transition 2019, 3, :o2, 1553994000
+          tz.transition 2019, 10, :o1, 1572138000
+          tz.transition 2020, 3, :o2, 1585443600
+          tz.transition 2020, 10, :o1, 1603587600
+          tz.transition 2021, 3, :o2, 1616893200
+          tz.transition 2021, 10, :o1, 1635642000
+          tz.transition 2022, 3, :o2, 1648342800
+          tz.transition 2022, 10, :o1, 1667091600
+          tz.transition 2023, 3, :o2, 1679792400
+          tz.transition 2023, 10, :o1, 1698541200
+          tz.transition 2024, 3, :o2, 1711846800
+          tz.transition 2024, 10, :o1, 1729990800
+          tz.transition 2025, 3, :o2, 1743296400
+          tz.transition 2025, 10, :o1, 1761440400
+          tz.transition 2026, 3, :o2, 1774746000
+          tz.transition 2026, 10, :o1, 1792890000
+          tz.transition 2027, 3, :o2, 1806195600
+          tz.transition 2027, 10, :o1, 1824944400
+          tz.transition 2028, 3, :o2, 1837645200
+          tz.transition 2028, 10, :o1, 1856394000
+          tz.transition 2029, 3, :o2, 1869094800
+          tz.transition 2029, 10, :o1, 1887843600
+          tz.transition 2030, 3, :o2, 1901149200
+          tz.transition 2030, 10, :o1, 1919293200
+          tz.transition 2031, 3, :o2, 1932598800
+          tz.transition 2031, 10, :o1, 1950742800
+          tz.transition 2032, 3, :o2, 1964048400
+          tz.transition 2032, 10, :o1, 1982797200
+          tz.transition 2033, 3, :o2, 1995498000
+          tz.transition 2033, 10, :o1, 2014246800
+          tz.transition 2034, 3, :o2, 2026947600
+          tz.transition 2034, 10, :o1, 2045696400
+          tz.transition 2035, 3, :o2, 2058397200
+          tz.transition 2035, 10, :o1, 2077146000
+          tz.transition 2036, 3, :o2, 2090451600
+          tz.transition 2036, 10, :o1, 2108595600
+          tz.transition 2037, 3, :o2, 2121901200
+          tz.transition 2037, 10, :o1, 2140045200
+          tz.transition 2038, 3, :o2, 59172253, 24
+          tz.transition 2038, 10, :o1, 59177461, 24
+          tz.transition 2039, 3, :o2, 59180989, 24
+          tz.transition 2039, 10, :o1, 59186197, 24
+          tz.transition 2040, 3, :o2, 59189725, 24
+          tz.transition 2040, 10, :o1, 59194933, 24
+          tz.transition 2041, 3, :o2, 59198629, 24
+          tz.transition 2041, 10, :o1, 59203669, 24
+          tz.transition 2042, 3, :o2, 59207365, 24
+          tz.transition 2042, 10, :o1, 59212405, 24
+          tz.transition 2043, 3, :o2, 59216101, 24
+          tz.transition 2043, 10, :o1, 59221141, 24
+          tz.transition 2044, 3, :o2, 59224837, 24
+          tz.transition 2044, 10, :o1, 59230045, 24
+          tz.transition 2045, 3, :o2, 59233573, 24
+          tz.transition 2045, 10, :o1, 59238781, 24
+          tz.transition 2046, 3, :o2, 59242309, 24
+          tz.transition 2046, 10, :o1, 59247517, 24
+          tz.transition 2047, 3, :o2, 59251213, 24
+          tz.transition 2047, 10, :o1, 59256253, 24
+          tz.transition 2048, 3, :o2, 59259949, 24
+          tz.transition 2048, 10, :o1, 59264989, 24
+          tz.transition 2049, 3, :o2, 59268685, 24
+          tz.transition 2049, 10, :o1, 59273893, 24
+          tz.transition 2050, 3, :o2, 59277421, 24
+          tz.transition 2050, 10, :o1, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bratislava.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bratislava.rb
new file mode 100644
index 00000000..7a731a0b
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bratislava.rb
@@ -0,0 +1,13 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Bratislava
+        include TimezoneDefinition
+        
+        linked_timezone 'Europe/Bratislava', 'Europe/Prague'
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Brussels.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Brussels.rb
new file mode 100644
index 00000000..6b0a2429
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Brussels.rb
@@ -0,0 +1,232 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Brussels
+        include TimezoneDefinition
+        
+        timezone 'Europe/Brussels' do |tz|
+          tz.offset :o0, 1050, 0, :LMT
+          tz.offset :o1, 1050, 0, :BMT
+          tz.offset :o2, 0, 0, :WET
+          tz.offset :o3, 3600, 0, :CET
+          tz.offset :o4, 3600, 3600, :CEST
+          tz.offset :o5, 0, 3600, :WEST
+          
+          tz.transition 1879, 12, :o1, 1386844121, 576
+          tz.transition 1892, 5, :o2, 1389438713, 576
+          tz.transition 1914, 11, :o3, 4840889, 2
+          tz.transition 1916, 4, :o4, 58103627, 24
+          tz.transition 1916, 9, :o3, 58107299, 24
+          tz.transition 1917, 4, :o4, 58112029, 24
+          tz.transition 1917, 9, :o3, 58115725, 24
+          tz.transition 1918, 4, :o4, 58120765, 24
+          tz.transition 1918, 9, :o3, 58124461, 24
+          tz.transition 1918, 11, :o2, 58125815, 24
+          tz.transition 1919, 3, :o5, 58128467, 24
+          tz.transition 1919, 10, :o2, 58133675, 24
+          tz.transition 1920, 2, :o5, 58136867, 24
+          tz.transition 1920, 10, :o2, 58142915, 24
+          tz.transition 1921, 3, :o5, 58146323, 24
+          tz.transition 1921, 10, :o2, 58151723, 24
+          tz.transition 1922, 3, :o5, 58155347, 24
+          tz.transition 1922, 10, :o2, 58160051, 24
+          tz.transition 1923, 4, :o5, 58164755, 24
+          tz.transition 1923, 10, :o2, 58168787, 24
+          tz.transition 1924, 3, :o5, 58172987, 24
+          tz.transition 1924, 10, :o2, 58177523, 24
+          tz.transition 1925, 4, :o5, 58181891, 24
+          tz.transition 1925, 10, :o2, 58186259, 24
+          tz.transition 1926, 4, :o5, 58190963, 24
+          tz.transition 1926, 10, :o2, 58194995, 24
+          tz.transition 1927, 4, :o5, 58199531, 24
+          tz.transition 1927, 10, :o2, 58203731, 24
+          tz.transition 1928, 4, :o5, 58208435, 24
+          tz.transition 1928, 10, :o2, 29106319, 12
+          tz.transition 1929, 4, :o5, 29108671, 12
+          tz.transition 1929, 10, :o2, 29110687, 12
+          tz.transition 1930, 4, :o5, 29112955, 12
+          tz.transition 1930, 10, :o2, 29115055, 12
+          tz.transition 1931, 4, :o5, 29117407, 12
+          tz.transition 1931, 10, :o2, 29119423, 12
+          tz.transition 1932, 4, :o5, 29121607, 12
+          tz.transition 1932, 10, :o2, 29123791, 12
+          tz.transition 1933, 3, :o5, 29125891, 12
+          tz.transition 1933, 10, :o2, 29128243, 12
+          tz.transition 1934, 4, :o5, 29130427, 12
+          tz.transition 1934, 10, :o2, 29132611, 12
+          tz.transition 1935, 3, :o5, 29134711, 12
+          tz.transition 1935, 10, :o2, 29136979, 12
+          tz.transition 1936, 4, :o5, 29139331, 12
+          tz.transition 1936, 10, :o2, 29141347, 12
+          tz.transition 1937, 4, :o5, 29143531, 12
+          tz.transition 1937, 10, :o2, 29145715, 12
+          tz.transition 1938, 3, :o5, 29147815, 12
+          tz.transition 1938, 10, :o2, 29150083, 12
+          tz.transition 1939, 4, :o5, 29152435, 12
+          tz.transition 1939, 11, :o2, 29155039, 12
+          tz.transition 1940, 2, :o5, 29156215, 12
+          tz.transition 1940, 5, :o4, 29157235, 12
+          tz.transition 1942, 11, :o3, 58335973, 24
+          tz.transition 1943, 3, :o4, 58339501, 24
+          tz.transition 1943, 10, :o3, 58344037, 24
+          tz.transition 1944, 4, :o4, 58348405, 24
+          tz.transition 1944, 9, :o3, 58352413, 24
+          tz.transition 1945, 4, :o4, 58357141, 24
+          tz.transition 1945, 9, :o3, 58361149, 24
+          tz.transition 1946, 5, :o4, 58367029, 24
+          tz.transition 1946, 10, :o3, 58370413, 24
+          tz.transition 1977, 4, :o4, 228877200
+          tz.transition 1977, 9, :o3, 243997200
+          tz.transition 1978, 4, :o4, 260326800
+          tz.transition 1978, 10, :o3, 276051600
+          tz.transition 1979, 4, :o4, 291776400
+          tz.transition 1979, 9, :o3, 307501200
+          tz.transition 1980, 4, :o4, 323830800
+          tz.transition 1980, 9, :o3, 338950800
+          tz.transition 1981, 3, :o4, 354675600
+          tz.transition 1981, 9, :o3, 370400400
+          tz.transition 1982, 3, :o4, 386125200
+          tz.transition 1982, 9, :o3, 401850000
+          tz.transition 1983, 3, :o4, 417574800
+          tz.transition 1983, 9, :o3, 433299600
+          tz.transition 1984, 3, :o4, 449024400
+          tz.transition 1984, 9, :o3, 465354000
+          tz.transition 1985, 3, :o4, 481078800
+          tz.transition 1985, 9, :o3, 496803600
+          tz.transition 1986, 3, :o4, 512528400
+          tz.transition 1986, 9, :o3, 528253200
+          tz.transition 1987, 3, :o4, 543978000
+          tz.transition 1987, 9, :o3, 559702800
+          tz.transition 1988, 3, :o4, 575427600
+          tz.transition 1988, 9, :o3, 591152400
+          tz.transition 1989, 3, :o4, 606877200
+          tz.transition 1989, 9, :o3, 622602000
+          tz.transition 1990, 3, :o4, 638326800
+          tz.transition 1990, 9, :o3, 654656400
+          tz.transition 1991, 3, :o4, 670381200
+          tz.transition 1991, 9, :o3, 686106000
+          tz.transition 1992, 3, :o4, 701830800
+          tz.transition 1992, 9, :o3, 717555600
+          tz.transition 1993, 3, :o4, 733280400
+          tz.transition 1993, 9, :o3, 749005200
+          tz.transition 1994, 3, :o4, 764730000
+          tz.transition 1994, 9, :o3, 780454800
+          tz.transition 1995, 3, :o4, 796179600
+          tz.transition 1995, 9, :o3, 811904400
+          tz.transition 1996, 3, :o4, 828234000
+          tz.transition 1996, 10, :o3, 846378000
+          tz.transition 1997, 3, :o4, 859683600
+          tz.transition 1997, 10, :o3, 877827600
+          tz.transition 1998, 3, :o4, 891133200
+          tz.transition 1998, 10, :o3, 909277200
+          tz.transition 1999, 3, :o4, 922582800
+          tz.transition 1999, 10, :o3, 941331600
+          tz.transition 2000, 3, :o4, 954032400
+          tz.transition 2000, 10, :o3, 972781200
+          tz.transition 2001, 3, :o4, 985482000
+          tz.transition 2001, 10, :o3, 1004230800
+          tz.transition 2002, 3, :o4, 1017536400
+          tz.transition 2002, 10, :o3, 1035680400
+          tz.transition 2003, 3, :o4, 1048986000
+          tz.transition 2003, 10, :o3, 1067130000
+          tz.transition 2004, 3, :o4, 1080435600
+          tz.transition 2004, 10, :o3, 1099184400
+          tz.transition 2005, 3, :o4, 1111885200
+          tz.transition 2005, 10, :o3, 1130634000
+          tz.transition 2006, 3, :o4, 1143334800
+          tz.transition 2006, 10, :o3, 1162083600
+          tz.transition 2007, 3, :o4, 1174784400
+          tz.transition 2007, 10, :o3, 1193533200
+          tz.transition 2008, 3, :o4, 1206838800
+          tz.transition 2008, 10, :o3, 1224982800
+          tz.transition 2009, 3, :o4, 1238288400
+          tz.transition 2009, 10, :o3, 1256432400
+          tz.transition 2010, 3, :o4, 1269738000
+          tz.transition 2010, 10, :o3, 1288486800
+          tz.transition 2011, 3, :o4, 1301187600
+          tz.transition 2011, 10, :o3, 1319936400
+          tz.transition 2012, 3, :o4, 1332637200
+          tz.transition 2012, 10, :o3, 1351386000
+          tz.transition 2013, 3, :o4, 1364691600
+          tz.transition 2013, 10, :o3, 1382835600
+          tz.transition 2014, 3, :o4, 1396141200
+          tz.transition 2014, 10, :o3, 1414285200
+          tz.transition 2015, 3, :o4, 1427590800
+          tz.transition 2015, 10, :o3, 1445734800
+          tz.transition 2016, 3, :o4, 1459040400
+          tz.transition 2016, 10, :o3, 1477789200
+          tz.transition 2017, 3, :o4, 1490490000
+          tz.transition 2017, 10, :o3, 1509238800
+          tz.transition 2018, 3, :o4, 1521939600
+          tz.transition 2018, 10, :o3, 1540688400
+          tz.transition 2019, 3, :o4, 1553994000
+          tz.transition 2019, 10, :o3, 1572138000
+          tz.transition 2020, 3, :o4, 1585443600
+          tz.transition 2020, 10, :o3, 1603587600
+          tz.transition 2021, 3, :o4, 1616893200
+          tz.transition 2021, 10, :o3, 1635642000
+          tz.transition 2022, 3, :o4, 1648342800
+          tz.transition 2022, 10, :o3, 1667091600
+          tz.transition 2023, 3, :o4, 1679792400
+          tz.transition 2023, 10, :o3, 1698541200
+          tz.transition 2024, 3, :o4, 1711846800
+          tz.transition 2024, 10, :o3, 1729990800
+          tz.transition 2025, 3, :o4, 1743296400
+          tz.transition 2025, 10, :o3, 1761440400
+          tz.transition 2026, 3, :o4, 1774746000
+          tz.transition 2026, 10, :o3, 1792890000
+          tz.transition 2027, 3, :o4, 1806195600
+          tz.transition 2027, 10, :o3, 1824944400
+          tz.transition 2028, 3, :o4, 1837645200
+          tz.transition 2028, 10, :o3, 1856394000
+          tz.transition 2029, 3, :o4, 1869094800
+          tz.transition 2029, 10, :o3, 1887843600
+          tz.transition 2030, 3, :o4, 1901149200
+          tz.transition 2030, 10, :o3, 1919293200
+          tz.transition 2031, 3, :o4, 1932598800
+          tz.transition 2031, 10, :o3, 1950742800
+          tz.transition 2032, 3, :o4, 1964048400
+          tz.transition 2032, 10, :o3, 1982797200
+          tz.transition 2033, 3, :o4, 1995498000
+          tz.transition 2033, 10, :o3, 2014246800
+          tz.transition 2034, 3, :o4, 2026947600
+          tz.transition 2034, 10, :o3, 2045696400
+          tz.transition 2035, 3, :o4, 2058397200
+          tz.transition 2035, 10, :o3, 2077146000
+          tz.transition 2036, 3, :o4, 2090451600
+          tz.transition 2036, 10, :o3, 2108595600
+          tz.transition 2037, 3, :o4, 2121901200
+          tz.transition 2037, 10, :o3, 2140045200
+          tz.transition 2038, 3, :o4, 59172253, 24
+          tz.transition 2038, 10, :o3, 59177461, 24
+          tz.transition 2039, 3, :o4, 59180989, 24
+          tz.transition 2039, 10, :o3, 59186197, 24
+          tz.transition 2040, 3, :o4, 59189725, 24
+          tz.transition 2040, 10, :o3, 59194933, 24
+          tz.transition 2041, 3, :o4, 59198629, 24
+          tz.transition 2041, 10, :o3, 59203669, 24
+          tz.transition 2042, 3, :o4, 59207365, 24
+          tz.transition 2042, 10, :o3, 59212405, 24
+          tz.transition 2043, 3, :o4, 59216101, 24
+          tz.transition 2043, 10, :o3, 59221141, 24
+          tz.transition 2044, 3, :o4, 59224837, 24
+          tz.transition 2044, 10, :o3, 59230045, 24
+          tz.transition 2045, 3, :o4, 59233573, 24
+          tz.transition 2045, 10, :o3, 59238781, 24
+          tz.transition 2046, 3, :o4, 59242309, 24
+          tz.transition 2046, 10, :o3, 59247517, 24
+          tz.transition 2047, 3, :o4, 59251213, 24
+          tz.transition 2047, 10, :o3, 59256253, 24
+          tz.transition 2048, 3, :o4, 59259949, 24
+          tz.transition 2048, 10, :o3, 59264989, 24
+          tz.transition 2049, 3, :o4, 59268685, 24
+          tz.transition 2049, 10, :o3, 59273893, 24
+          tz.transition 2050, 3, :o4, 59277421, 24
+          tz.transition 2050, 10, :o3, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bucharest.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bucharest.rb
new file mode 100644
index 00000000..521c3c93
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bucharest.rb
@@ -0,0 +1,181 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Bucharest
+        include TimezoneDefinition
+        
+        timezone 'Europe/Bucharest' do |tz|
+          tz.offset :o0, 6264, 0, :LMT
+          tz.offset :o1, 6264, 0, :BMT
+          tz.offset :o2, 7200, 0, :EET
+          tz.offset :o3, 7200, 3600, :EEST
+          
+          tz.transition 1891, 9, :o1, 964802571, 400
+          tz.transition 1931, 7, :o2, 970618571, 400
+          tz.transition 1932, 5, :o3, 29122181, 12
+          tz.transition 1932, 10, :o2, 29123789, 12
+          tz.transition 1933, 4, :o3, 29125973, 12
+          tz.transition 1933, 9, :o2, 29128157, 12
+          tz.transition 1934, 4, :o3, 29130425, 12
+          tz.transition 1934, 10, :o2, 29132609, 12
+          tz.transition 1935, 4, :o3, 29134793, 12
+          tz.transition 1935, 10, :o2, 29136977, 12
+          tz.transition 1936, 4, :o3, 29139161, 12
+          tz.transition 1936, 10, :o2, 29141345, 12
+          tz.transition 1937, 4, :o3, 29143529, 12
+          tz.transition 1937, 10, :o2, 29145713, 12
+          tz.transition 1938, 4, :o3, 29147897, 12
+          tz.transition 1938, 10, :o2, 29150081, 12
+          tz.transition 1939, 4, :o3, 29152265, 12
+          tz.transition 1939, 9, :o2, 29154449, 12
+          tz.transition 1979, 5, :o3, 296604000
+          tz.transition 1979, 9, :o2, 307486800
+          tz.transition 1980, 4, :o3, 323816400
+          tz.transition 1980, 9, :o2, 338940000
+          tz.transition 1981, 3, :o3, 354672000
+          tz.transition 1981, 9, :o2, 370396800
+          tz.transition 1982, 3, :o3, 386121600
+          tz.transition 1982, 9, :o2, 401846400
+          tz.transition 1983, 3, :o3, 417571200
+          tz.transition 1983, 9, :o2, 433296000
+          tz.transition 1984, 3, :o3, 449020800
+          tz.transition 1984, 9, :o2, 465350400
+          tz.transition 1985, 3, :o3, 481075200
+          tz.transition 1985, 9, :o2, 496800000
+          tz.transition 1986, 3, :o3, 512524800
+          tz.transition 1986, 9, :o2, 528249600
+          tz.transition 1987, 3, :o3, 543974400
+          tz.transition 1987, 9, :o2, 559699200
+          tz.transition 1988, 3, :o3, 575424000
+          tz.transition 1988, 9, :o2, 591148800
+          tz.transition 1989, 3, :o3, 606873600
+          tz.transition 1989, 9, :o2, 622598400
+          tz.transition 1990, 3, :o3, 638323200
+          tz.transition 1990, 9, :o2, 654652800
+          tz.transition 1991, 3, :o3, 670370400
+          tz.transition 1991, 9, :o2, 686095200
+          tz.transition 1992, 3, :o3, 701820000
+          tz.transition 1992, 9, :o2, 717544800
+          tz.transition 1993, 3, :o3, 733269600
+          tz.transition 1993, 9, :o2, 748994400
+          tz.transition 1994, 3, :o3, 764719200
+          tz.transition 1994, 9, :o2, 780440400
+          tz.transition 1995, 3, :o3, 796168800
+          tz.transition 1995, 9, :o2, 811890000
+          tz.transition 1996, 3, :o3, 828223200
+          tz.transition 1996, 10, :o2, 846363600
+          tz.transition 1997, 3, :o3, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o3, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o3, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o3, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o3, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o3, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o3, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o3, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o3, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o3, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Budapest.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Budapest.rb
new file mode 100644
index 00000000..1f3a9738
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Budapest.rb
@@ -0,0 +1,197 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Budapest
+        include TimezoneDefinition
+        
+        timezone 'Europe/Budapest' do |tz|
+          tz.offset :o0, 4580, 0, :LMT
+          tz.offset :o1, 3600, 0, :CET
+          tz.offset :o2, 3600, 3600, :CEST
+          
+          tz.transition 1890, 9, :o1, 10418291051, 4320
+          tz.transition 1916, 4, :o2, 29051813, 12
+          tz.transition 1916, 9, :o1, 58107299, 24
+          tz.transition 1917, 4, :o2, 58112029, 24
+          tz.transition 1917, 9, :o1, 58115725, 24
+          tz.transition 1918, 4, :o2, 29060215, 12
+          tz.transition 1918, 9, :o1, 58124773, 24
+          tz.transition 1919, 4, :o2, 29064763, 12
+          tz.transition 1919, 9, :o1, 58133197, 24
+          tz.transition 1920, 4, :o2, 29069035, 12
+          tz.transition 1920, 9, :o1, 58142341, 24
+          tz.transition 1941, 4, :o2, 58322173, 24
+          tz.transition 1942, 11, :o1, 58335973, 24
+          tz.transition 1943, 3, :o2, 58339501, 24
+          tz.transition 1943, 10, :o1, 58344037, 24
+          tz.transition 1944, 4, :o2, 58348405, 24
+          tz.transition 1944, 10, :o1, 58352773, 24
+          tz.transition 1945, 5, :o2, 29178929, 12
+          tz.transition 1945, 11, :o1, 29181149, 12
+          tz.transition 1946, 3, :o2, 58365853, 24
+          tz.transition 1946, 10, :o1, 58370389, 24
+          tz.transition 1947, 4, :o2, 58374757, 24
+          tz.transition 1947, 10, :o1, 58379125, 24
+          tz.transition 1948, 4, :o2, 58383493, 24
+          tz.transition 1948, 10, :o1, 58387861, 24
+          tz.transition 1949, 4, :o2, 58392397, 24
+          tz.transition 1949, 10, :o1, 58396597, 24
+          tz.transition 1950, 4, :o2, 58401325, 24
+          tz.transition 1950, 10, :o1, 58405861, 24
+          tz.transition 1954, 5, :o2, 58437251, 24
+          tz.transition 1954, 10, :o1, 29220221, 12
+          tz.transition 1955, 5, :o2, 58446011, 24
+          tz.transition 1955, 10, :o1, 29224601, 12
+          tz.transition 1956, 6, :o2, 58455059, 24
+          tz.transition 1956, 9, :o1, 29228957, 12
+          tz.transition 1957, 6, :o2, 4871983, 2
+          tz.transition 1957, 9, :o1, 58466653, 24
+          tz.transition 1980, 4, :o2, 323827200
+          tz.transition 1980, 9, :o1, 338950800
+          tz.transition 1981, 3, :o2, 354675600
+          tz.transition 1981, 9, :o1, 370400400
+          tz.transition 1982, 3, :o2, 386125200
+          tz.transition 1982, 9, :o1, 401850000
+          tz.transition 1983, 3, :o2, 417574800
+          tz.transition 1983, 9, :o1, 433299600
+          tz.transition 1984, 3, :o2, 449024400
+          tz.transition 1984, 9, :o1, 465354000
+          tz.transition 1985, 3, :o2, 481078800
+          tz.transition 1985, 9, :o1, 496803600
+          tz.transition 1986, 3, :o2, 512528400
+          tz.transition 1986, 9, :o1, 528253200
+          tz.transition 1987, 3, :o2, 543978000
+          tz.transition 1987, 9, :o1, 559702800
+          tz.transition 1988, 3, :o2, 575427600
+          tz.transition 1988, 9, :o1, 591152400
+          tz.transition 1989, 3, :o2, 606877200
+          tz.transition 1989, 9, :o1, 622602000
+          tz.transition 1990, 3, :o2, 638326800
+          tz.transition 1990, 9, :o1, 654656400
+          tz.transition 1991, 3, :o2, 670381200
+          tz.transition 1991, 9, :o1, 686106000
+          tz.transition 1992, 3, :o2, 701830800
+          tz.transition 1992, 9, :o1, 717555600
+          tz.transition 1993, 3, :o2, 733280400
+          tz.transition 1993, 9, :o1, 749005200
+          tz.transition 1994, 3, :o2, 764730000
+          tz.transition 1994, 9, :o1, 780454800
+          tz.transition 1995, 3, :o2, 796179600
+          tz.transition 1995, 9, :o1, 811904400
+          tz.transition 1996, 3, :o2, 828234000
+          tz.transition 1996, 10, :o1, 846378000
+          tz.transition 1997, 3, :o2, 859683600
+          tz.transition 1997, 10, :o1, 877827600
+          tz.transition 1998, 3, :o2, 891133200
+          tz.transition 1998, 10, :o1, 909277200
+          tz.transition 1999, 3, :o2, 922582800
+          tz.transition 1999, 10, :o1, 941331600
+          tz.transition 2000, 3, :o2, 954032400
+          tz.transition 2000, 10, :o1, 972781200
+          tz.transition 2001, 3, :o2, 985482000
+          tz.transition 2001, 10, :o1, 1004230800
+          tz.transition 2002, 3, :o2, 1017536400
+          tz.transition 2002, 10, :o1, 1035680400
+          tz.transition 2003, 3, :o2, 1048986000
+          tz.transition 2003, 10, :o1, 1067130000
+          tz.transition 2004, 3, :o2, 1080435600
+          tz.transition 2004, 10, :o1, 1099184400
+          tz.transition 2005, 3, :o2, 1111885200
+          tz.transition 2005, 10, :o1, 1130634000
+          tz.transition 2006, 3, :o2, 1143334800
+          tz.transition 2006, 10, :o1, 1162083600
+          tz.transition 2007, 3, :o2, 1174784400
+          tz.transition 2007, 10, :o1, 1193533200
+          tz.transition 2008, 3, :o2, 1206838800
+          tz.transition 2008, 10, :o1, 1224982800
+          tz.transition 2009, 3, :o2, 1238288400
+          tz.transition 2009, 10, :o1, 1256432400
+          tz.transition 2010, 3, :o2, 1269738000
+          tz.transition 2010, 10, :o1, 1288486800
+          tz.transition 2011, 3, :o2, 1301187600
+          tz.transition 2011, 10, :o1, 1319936400
+          tz.transition 2012, 3, :o2, 1332637200
+          tz.transition 2012, 10, :o1, 1351386000
+          tz.transition 2013, 3, :o2, 1364691600
+          tz.transition 2013, 10, :o1, 1382835600
+          tz.transition 2014, 3, :o2, 1396141200
+          tz.transition 2014, 10, :o1, 1414285200
+          tz.transition 2015, 3, :o2, 1427590800
+          tz.transition 2015, 10, :o1, 1445734800
+          tz.transition 2016, 3, :o2, 1459040400
+          tz.transition 2016, 10, :o1, 1477789200
+          tz.transition 2017, 3, :o2, 1490490000
+          tz.transition 2017, 10, :o1, 1509238800
+          tz.transition 2018, 3, :o2, 1521939600
+          tz.transition 2018, 10, :o1, 1540688400
+          tz.transition 2019, 3, :o2, 1553994000
+          tz.transition 2019, 10, :o1, 1572138000
+          tz.transition 2020, 3, :o2, 1585443600
+          tz.transition 2020, 10, :o1, 1603587600
+          tz.transition 2021, 3, :o2, 1616893200
+          tz.transition 2021, 10, :o1, 1635642000
+          tz.transition 2022, 3, :o2, 1648342800
+          tz.transition 2022, 10, :o1, 1667091600
+          tz.transition 2023, 3, :o2, 1679792400
+          tz.transition 2023, 10, :o1, 1698541200
+          tz.transition 2024, 3, :o2, 1711846800
+          tz.transition 2024, 10, :o1, 1729990800
+          tz.transition 2025, 3, :o2, 1743296400
+          tz.transition 2025, 10, :o1, 1761440400
+          tz.transition 2026, 3, :o2, 1774746000
+          tz.transition 2026, 10, :o1, 1792890000
+          tz.transition 2027, 3, :o2, 1806195600
+          tz.transition 2027, 10, :o1, 1824944400
+          tz.transition 2028, 3, :o2, 1837645200
+          tz.transition 2028, 10, :o1, 1856394000
+          tz.transition 2029, 3, :o2, 1869094800
+          tz.transition 2029, 10, :o1, 1887843600
+          tz.transition 2030, 3, :o2, 1901149200
+          tz.transition 2030, 10, :o1, 1919293200
+          tz.transition 2031, 3, :o2, 1932598800
+          tz.transition 2031, 10, :o1, 1950742800
+          tz.transition 2032, 3, :o2, 1964048400
+          tz.transition 2032, 10, :o1, 1982797200
+          tz.transition 2033, 3, :o2, 1995498000
+          tz.transition 2033, 10, :o1, 2014246800
+          tz.transition 2034, 3, :o2, 2026947600
+          tz.transition 2034, 10, :o1, 2045696400
+          tz.transition 2035, 3, :o2, 2058397200
+          tz.transition 2035, 10, :o1, 2077146000
+          tz.transition 2036, 3, :o2, 2090451600
+          tz.transition 2036, 10, :o1, 2108595600
+          tz.transition 2037, 3, :o2, 2121901200
+          tz.transition 2037, 10, :o1, 2140045200
+          tz.transition 2038, 3, :o2, 59172253, 24
+          tz.transition 2038, 10, :o1, 59177461, 24
+          tz.transition 2039, 3, :o2, 59180989, 24
+          tz.transition 2039, 10, :o1, 59186197, 24
+          tz.transition 2040, 3, :o2, 59189725, 24
+          tz.transition 2040, 10, :o1, 59194933, 24
+          tz.transition 2041, 3, :o2, 59198629, 24
+          tz.transition 2041, 10, :o1, 59203669, 24
+          tz.transition 2042, 3, :o2, 59207365, 24
+          tz.transition 2042, 10, :o1, 59212405, 24
+          tz.transition 2043, 3, :o2, 59216101, 24
+          tz.transition 2043, 10, :o1, 59221141, 24
+          tz.transition 2044, 3, :o2, 59224837, 24
+          tz.transition 2044, 10, :o1, 59230045, 24
+          tz.transition 2045, 3, :o2, 59233573, 24
+          tz.transition 2045, 10, :o1, 59238781, 24
+          tz.transition 2046, 3, :o2, 59242309, 24
+          tz.transition 2046, 10, :o1, 59247517, 24
+          tz.transition 2047, 3, :o2, 59251213, 24
+          tz.transition 2047, 10, :o1, 59256253, 24
+          tz.transition 2048, 3, :o2, 59259949, 24
+          tz.transition 2048, 10, :o1, 59264989, 24
+          tz.transition 2049, 3, :o2, 59268685, 24
+          tz.transition 2049, 10, :o1, 59273893, 24
+          tz.transition 2050, 3, :o2, 59277421, 24
+          tz.transition 2050, 10, :o1, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Copenhagen.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Copenhagen.rb
new file mode 100644
index 00000000..47cbaf14
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Copenhagen.rb
@@ -0,0 +1,179 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Copenhagen
+        include TimezoneDefinition
+        
+        timezone 'Europe/Copenhagen' do |tz|
+          tz.offset :o0, 3020, 0, :LMT
+          tz.offset :o1, 3020, 0, :CMT
+          tz.offset :o2, 3600, 0, :CET
+          tz.offset :o3, 3600, 3600, :CEST
+          
+          tz.transition 1889, 12, :o1, 10417111769, 4320
+          tz.transition 1893, 12, :o2, 10423423289, 4320
+          tz.transition 1916, 5, :o3, 29051981, 12
+          tz.transition 1916, 9, :o2, 19369099, 8
+          tz.transition 1940, 5, :o3, 58314347, 24
+          tz.transition 1942, 11, :o2, 58335973, 24
+          tz.transition 1943, 3, :o3, 58339501, 24
+          tz.transition 1943, 10, :o2, 58344037, 24
+          tz.transition 1944, 4, :o3, 58348405, 24
+          tz.transition 1944, 10, :o2, 58352773, 24
+          tz.transition 1945, 4, :o3, 58357141, 24
+          tz.transition 1945, 8, :o2, 58360381, 24
+          tz.transition 1946, 5, :o3, 58366597, 24
+          tz.transition 1946, 9, :o2, 58369549, 24
+          tz.transition 1947, 5, :o3, 58375429, 24
+          tz.transition 1947, 8, :o2, 58377781, 24
+          tz.transition 1948, 5, :o3, 58384333, 24
+          tz.transition 1948, 8, :o2, 58386517, 24
+          tz.transition 1980, 4, :o3, 323830800
+          tz.transition 1980, 9, :o2, 338950800
+          tz.transition 1981, 3, :o3, 354675600
+          tz.transition 1981, 9, :o2, 370400400
+          tz.transition 1982, 3, :o3, 386125200
+          tz.transition 1982, 9, :o2, 401850000
+          tz.transition 1983, 3, :o3, 417574800
+          tz.transition 1983, 9, :o2, 433299600
+          tz.transition 1984, 3, :o3, 449024400
+          tz.transition 1984, 9, :o2, 465354000
+          tz.transition 1985, 3, :o3, 481078800
+          tz.transition 1985, 9, :o2, 496803600
+          tz.transition 1986, 3, :o3, 512528400
+          tz.transition 1986, 9, :o2, 528253200
+          tz.transition 1987, 3, :o3, 543978000
+          tz.transition 1987, 9, :o2, 559702800
+          tz.transition 1988, 3, :o3, 575427600
+          tz.transition 1988, 9, :o2, 591152400
+          tz.transition 1989, 3, :o3, 606877200
+          tz.transition 1989, 9, :o2, 622602000
+          tz.transition 1990, 3, :o3, 638326800
+          tz.transition 1990, 9, :o2, 654656400
+          tz.transition 1991, 3, :o3, 670381200
+          tz.transition 1991, 9, :o2, 686106000
+          tz.transition 1992, 3, :o3, 701830800
+          tz.transition 1992, 9, :o2, 717555600
+          tz.transition 1993, 3, :o3, 733280400
+          tz.transition 1993, 9, :o2, 749005200
+          tz.transition 1994, 3, :o3, 764730000
+          tz.transition 1994, 9, :o2, 780454800
+          tz.transition 1995, 3, :o3, 796179600
+          tz.transition 1995, 9, :o2, 811904400
+          tz.transition 1996, 3, :o3, 828234000
+          tz.transition 1996, 10, :o2, 846378000
+          tz.transition 1997, 3, :o3, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o3, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o3, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o3, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o3, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o3, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o3, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o3, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o3, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o3, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Dublin.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Dublin.rb
new file mode 100644
index 00000000..0560bb54
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Dublin.rb
@@ -0,0 +1,276 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Dublin
+        include TimezoneDefinition
+        
+        timezone 'Europe/Dublin' do |tz|
+          tz.offset :o0, -1500, 0, :LMT
+          tz.offset :o1, -1521, 0, :DMT
+          tz.offset :o2, -1521, 3600, :IST
+          tz.offset :o3, 0, 0, :GMT
+          tz.offset :o4, 0, 3600, :BST
+          tz.offset :o5, 0, 3600, :IST
+          tz.offset :o6, 3600, 0, :IST
+          
+          tz.transition 1880, 8, :o1, 693483701, 288
+          tz.transition 1916, 5, :o2, 7747214723, 3200
+          tz.transition 1916, 10, :o3, 7747640323, 3200
+          tz.transition 1917, 4, :o4, 29055919, 12
+          tz.transition 1917, 9, :o3, 29057863, 12
+          tz.transition 1918, 3, :o4, 29060119, 12
+          tz.transition 1918, 9, :o3, 29062399, 12
+          tz.transition 1919, 3, :o4, 29064571, 12
+          tz.transition 1919, 9, :o3, 29066767, 12
+          tz.transition 1920, 3, :o4, 29068939, 12
+          tz.transition 1920, 10, :o3, 29071471, 12
+          tz.transition 1921, 4, :o4, 29073391, 12
+          tz.transition 1921, 10, :o3, 29075587, 12
+          tz.transition 1922, 3, :o5, 29077675, 12
+          tz.transition 1922, 10, :o3, 29080027, 12
+          tz.transition 1923, 4, :o5, 29082379, 12
+          tz.transition 1923, 9, :o3, 29084143, 12
+          tz.transition 1924, 4, :o5, 29086663, 12
+          tz.transition 1924, 9, :o3, 29088595, 12
+          tz.transition 1925, 4, :o5, 29091115, 12
+          tz.transition 1925, 10, :o3, 29093131, 12
+          tz.transition 1926, 4, :o5, 29095483, 12
+          tz.transition 1926, 10, :o3, 29097499, 12
+          tz.transition 1927, 4, :o5, 29099767, 12
+          tz.transition 1927, 10, :o3, 29101867, 12
+          tz.transition 1928, 4, :o5, 29104303, 12
+          tz.transition 1928, 10, :o3, 29106319, 12
+          tz.transition 1929, 4, :o5, 29108671, 12
+          tz.transition 1929, 10, :o3, 29110687, 12
+          tz.transition 1930, 4, :o5, 29112955, 12
+          tz.transition 1930, 10, :o3, 29115055, 12
+          tz.transition 1931, 4, :o5, 29117407, 12
+          tz.transition 1931, 10, :o3, 29119423, 12
+          tz.transition 1932, 4, :o5, 29121775, 12
+          tz.transition 1932, 10, :o3, 29123791, 12
+          tz.transition 1933, 4, :o5, 29126059, 12
+          tz.transition 1933, 10, :o3, 29128243, 12
+          tz.transition 1934, 4, :o5, 29130595, 12
+          tz.transition 1934, 10, :o3, 29132611, 12
+          tz.transition 1935, 4, :o5, 29134879, 12
+          tz.transition 1935, 10, :o3, 29136979, 12
+          tz.transition 1936, 4, :o5, 29139331, 12
+          tz.transition 1936, 10, :o3, 29141347, 12
+          tz.transition 1937, 4, :o5, 29143699, 12
+          tz.transition 1937, 10, :o3, 29145715, 12
+          tz.transition 1938, 4, :o5, 29147983, 12
+          tz.transition 1938, 10, :o3, 29150083, 12
+          tz.transition 1939, 4, :o5, 29152435, 12
+          tz.transition 1939, 11, :o3, 29155039, 12
+          tz.transition 1940, 2, :o5, 29156215, 12
+          tz.transition 1946, 10, :o3, 58370389, 24
+          tz.transition 1947, 3, :o5, 29187127, 12
+          tz.transition 1947, 11, :o3, 58379797, 24
+          tz.transition 1948, 4, :o5, 29191915, 12
+          tz.transition 1948, 10, :o3, 29194267, 12
+          tz.transition 1949, 4, :o5, 29196115, 12
+          tz.transition 1949, 10, :o3, 29198635, 12
+          tz.transition 1950, 4, :o5, 29200651, 12
+          tz.transition 1950, 10, :o3, 29202919, 12
+          tz.transition 1951, 4, :o5, 29205019, 12
+          tz.transition 1951, 10, :o3, 29207287, 12
+          tz.transition 1952, 4, :o5, 29209471, 12
+          tz.transition 1952, 10, :o3, 29211739, 12
+          tz.transition 1953, 4, :o5, 29213839, 12
+          tz.transition 1953, 10, :o3, 29215855, 12
+          tz.transition 1954, 4, :o5, 29218123, 12
+          tz.transition 1954, 10, :o3, 29220223, 12
+          tz.transition 1955, 4, :o5, 29222575, 12
+          tz.transition 1955, 10, :o3, 29224591, 12
+          tz.transition 1956, 4, :o5, 29227027, 12
+          tz.transition 1956, 10, :o3, 29229043, 12
+          tz.transition 1957, 4, :o5, 29231311, 12
+          tz.transition 1957, 10, :o3, 29233411, 12
+          tz.transition 1958, 4, :o5, 29235763, 12
+          tz.transition 1958, 10, :o3, 29237779, 12
+          tz.transition 1959, 4, :o5, 29240131, 12
+          tz.transition 1959, 10, :o3, 29242147, 12
+          tz.transition 1960, 4, :o5, 29244415, 12
+          tz.transition 1960, 10, :o3, 29246515, 12
+          tz.transition 1961, 3, :o5, 29248615, 12
+          tz.transition 1961, 10, :o3, 29251219, 12
+          tz.transition 1962, 3, :o5, 29252983, 12
+          tz.transition 1962, 10, :o3, 29255587, 12
+          tz.transition 1963, 3, :o5, 29257435, 12
+          tz.transition 1963, 10, :o3, 29259955, 12
+          tz.transition 1964, 3, :o5, 29261719, 12
+          tz.transition 1964, 10, :o3, 29264323, 12
+          tz.transition 1965, 3, :o5, 29266087, 12
+          tz.transition 1965, 10, :o3, 29268691, 12
+          tz.transition 1966, 3, :o5, 29270455, 12
+          tz.transition 1966, 10, :o3, 29273059, 12
+          tz.transition 1967, 3, :o5, 29274823, 12
+          tz.transition 1967, 10, :o3, 29277511, 12
+          tz.transition 1968, 2, :o5, 29278855, 12
+          tz.transition 1968, 10, :o6, 58563755, 24
+          tz.transition 1971, 10, :o3, 57722400
+          tz.transition 1972, 3, :o5, 69818400
+          tz.transition 1972, 10, :o3, 89172000
+          tz.transition 1973, 3, :o5, 101268000
+          tz.transition 1973, 10, :o3, 120621600
+          tz.transition 1974, 3, :o5, 132717600
+          tz.transition 1974, 10, :o3, 152071200
+          tz.transition 1975, 3, :o5, 164167200
+          tz.transition 1975, 10, :o3, 183520800
+          tz.transition 1976, 3, :o5, 196221600
+          tz.transition 1976, 10, :o3, 214970400
+          tz.transition 1977, 3, :o5, 227671200
+          tz.transition 1977, 10, :o3, 246420000
+          tz.transition 1978, 3, :o5, 259120800
+          tz.transition 1978, 10, :o3, 278474400
+          tz.transition 1979, 3, :o5, 290570400
+          tz.transition 1979, 10, :o3, 309924000
+          tz.transition 1980, 3, :o5, 322020000
+          tz.transition 1980, 10, :o3, 341373600
+          tz.transition 1981, 3, :o5, 354675600
+          tz.transition 1981, 10, :o3, 372819600
+          tz.transition 1982, 3, :o5, 386125200
+          tz.transition 1982, 10, :o3, 404269200
+          tz.transition 1983, 3, :o5, 417574800
+          tz.transition 1983, 10, :o3, 435718800
+          tz.transition 1984, 3, :o5, 449024400
+          tz.transition 1984, 10, :o3, 467773200
+          tz.transition 1985, 3, :o5, 481078800
+          tz.transition 1985, 10, :o3, 499222800
+          tz.transition 1986, 3, :o5, 512528400
+          tz.transition 1986, 10, :o3, 530672400
+          tz.transition 1987, 3, :o5, 543978000
+          tz.transition 1987, 10, :o3, 562122000
+          tz.transition 1988, 3, :o5, 575427600
+          tz.transition 1988, 10, :o3, 593571600
+          tz.transition 1989, 3, :o5, 606877200
+          tz.transition 1989, 10, :o3, 625626000
+          tz.transition 1990, 3, :o5, 638326800
+          tz.transition 1990, 10, :o3, 657075600
+          tz.transition 1991, 3, :o5, 670381200
+          tz.transition 1991, 10, :o3, 688525200
+          tz.transition 1992, 3, :o5, 701830800
+          tz.transition 1992, 10, :o3, 719974800
+          tz.transition 1993, 3, :o5, 733280400
+          tz.transition 1993, 10, :o3, 751424400
+          tz.transition 1994, 3, :o5, 764730000
+          tz.transition 1994, 10, :o3, 782874000
+          tz.transition 1995, 3, :o5, 796179600
+          tz.transition 1995, 10, :o3, 814323600
+          tz.transition 1996, 3, :o5, 828234000
+          tz.transition 1996, 10, :o3, 846378000
+          tz.transition 1997, 3, :o5, 859683600
+          tz.transition 1997, 10, :o3, 877827600
+          tz.transition 1998, 3, :o5, 891133200
+          tz.transition 1998, 10, :o3, 909277200
+          tz.transition 1999, 3, :o5, 922582800
+          tz.transition 1999, 10, :o3, 941331600
+          tz.transition 2000, 3, :o5, 954032400
+          tz.transition 2000, 10, :o3, 972781200
+          tz.transition 2001, 3, :o5, 985482000
+          tz.transition 2001, 10, :o3, 1004230800
+          tz.transition 2002, 3, :o5, 1017536400
+          tz.transition 2002, 10, :o3, 1035680400
+          tz.transition 2003, 3, :o5, 1048986000
+          tz.transition 2003, 10, :o3, 1067130000
+          tz.transition 2004, 3, :o5, 1080435600
+          tz.transition 2004, 10, :o3, 1099184400
+          tz.transition 2005, 3, :o5, 1111885200
+          tz.transition 2005, 10, :o3, 1130634000
+          tz.transition 2006, 3, :o5, 1143334800
+          tz.transition 2006, 10, :o3, 1162083600
+          tz.transition 2007, 3, :o5, 1174784400
+          tz.transition 2007, 10, :o3, 1193533200
+          tz.transition 2008, 3, :o5, 1206838800
+          tz.transition 2008, 10, :o3, 1224982800
+          tz.transition 2009, 3, :o5, 1238288400
+          tz.transition 2009, 10, :o3, 1256432400
+          tz.transition 2010, 3, :o5, 1269738000
+          tz.transition 2010, 10, :o3, 1288486800
+          tz.transition 2011, 3, :o5, 1301187600
+          tz.transition 2011, 10, :o3, 1319936400
+          tz.transition 2012, 3, :o5, 1332637200
+          tz.transition 2012, 10, :o3, 1351386000
+          tz.transition 2013, 3, :o5, 1364691600
+          tz.transition 2013, 10, :o3, 1382835600
+          tz.transition 2014, 3, :o5, 1396141200
+          tz.transition 2014, 10, :o3, 1414285200
+          tz.transition 2015, 3, :o5, 1427590800
+          tz.transition 2015, 10, :o3, 1445734800
+          tz.transition 2016, 3, :o5, 1459040400
+          tz.transition 2016, 10, :o3, 1477789200
+          tz.transition 2017, 3, :o5, 1490490000
+          tz.transition 2017, 10, :o3, 1509238800
+          tz.transition 2018, 3, :o5, 1521939600
+          tz.transition 2018, 10, :o3, 1540688400
+          tz.transition 2019, 3, :o5, 1553994000
+          tz.transition 2019, 10, :o3, 1572138000
+          tz.transition 2020, 3, :o5, 1585443600
+          tz.transition 2020, 10, :o3, 1603587600
+          tz.transition 2021, 3, :o5, 1616893200
+          tz.transition 2021, 10, :o3, 1635642000
+          tz.transition 2022, 3, :o5, 1648342800
+          tz.transition 2022, 10, :o3, 1667091600
+          tz.transition 2023, 3, :o5, 1679792400
+          tz.transition 2023, 10, :o3, 1698541200
+          tz.transition 2024, 3, :o5, 1711846800
+          tz.transition 2024, 10, :o3, 1729990800
+          tz.transition 2025, 3, :o5, 1743296400
+          tz.transition 2025, 10, :o3, 1761440400
+          tz.transition 2026, 3, :o5, 1774746000
+          tz.transition 2026, 10, :o3, 1792890000
+          tz.transition 2027, 3, :o5, 1806195600
+          tz.transition 2027, 10, :o3, 1824944400
+          tz.transition 2028, 3, :o5, 1837645200
+          tz.transition 2028, 10, :o3, 1856394000
+          tz.transition 2029, 3, :o5, 1869094800
+          tz.transition 2029, 10, :o3, 1887843600
+          tz.transition 2030, 3, :o5, 1901149200
+          tz.transition 2030, 10, :o3, 1919293200
+          tz.transition 2031, 3, :o5, 1932598800
+          tz.transition 2031, 10, :o3, 1950742800
+          tz.transition 2032, 3, :o5, 1964048400
+          tz.transition 2032, 10, :o3, 1982797200
+          tz.transition 2033, 3, :o5, 1995498000
+          tz.transition 2033, 10, :o3, 2014246800
+          tz.transition 2034, 3, :o5, 2026947600
+          tz.transition 2034, 10, :o3, 2045696400
+          tz.transition 2035, 3, :o5, 2058397200
+          tz.transition 2035, 10, :o3, 2077146000
+          tz.transition 2036, 3, :o5, 2090451600
+          tz.transition 2036, 10, :o3, 2108595600
+          tz.transition 2037, 3, :o5, 2121901200
+          tz.transition 2037, 10, :o3, 2140045200
+          tz.transition 2038, 3, :o5, 59172253, 24
+          tz.transition 2038, 10, :o3, 59177461, 24
+          tz.transition 2039, 3, :o5, 59180989, 24
+          tz.transition 2039, 10, :o3, 59186197, 24
+          tz.transition 2040, 3, :o5, 59189725, 24
+          tz.transition 2040, 10, :o3, 59194933, 24
+          tz.transition 2041, 3, :o5, 59198629, 24
+          tz.transition 2041, 10, :o3, 59203669, 24
+          tz.transition 2042, 3, :o5, 59207365, 24
+          tz.transition 2042, 10, :o3, 59212405, 24
+          tz.transition 2043, 3, :o5, 59216101, 24
+          tz.transition 2043, 10, :o3, 59221141, 24
+          tz.transition 2044, 3, :o5, 59224837, 24
+          tz.transition 2044, 10, :o3, 59230045, 24
+          tz.transition 2045, 3, :o5, 59233573, 24
+          tz.transition 2045, 10, :o3, 59238781, 24
+          tz.transition 2046, 3, :o5, 59242309, 24
+          tz.transition 2046, 10, :o3, 59247517, 24
+          tz.transition 2047, 3, :o5, 59251213, 24
+          tz.transition 2047, 10, :o3, 59256253, 24
+          tz.transition 2048, 3, :o5, 59259949, 24
+          tz.transition 2048, 10, :o3, 59264989, 24
+          tz.transition 2049, 3, :o5, 59268685, 24
+          tz.transition 2049, 10, :o3, 59273893, 24
+          tz.transition 2050, 3, :o5, 59277421, 24
+          tz.transition 2050, 10, :o3, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Helsinki.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Helsinki.rb
new file mode 100644
index 00000000..13a806bc
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Helsinki.rb
@@ -0,0 +1,163 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Helsinki
+        include TimezoneDefinition
+        
+        timezone 'Europe/Helsinki' do |tz|
+          tz.offset :o0, 5992, 0, :LMT
+          tz.offset :o1, 5992, 0, :HMT
+          tz.offset :o2, 7200, 0, :EET
+          tz.offset :o3, 7200, 3600, :EEST
+          
+          tz.transition 1878, 5, :o1, 25997062651, 10800
+          tz.transition 1921, 4, :o2, 26166352651, 10800
+          tz.transition 1942, 4, :o3, 29165429, 12
+          tz.transition 1942, 10, :o2, 19445083, 8
+          tz.transition 1981, 3, :o3, 354675600
+          tz.transition 1981, 9, :o2, 370400400
+          tz.transition 1982, 3, :o3, 386125200
+          tz.transition 1982, 9, :o2, 401850000
+          tz.transition 1983, 3, :o3, 417574800
+          tz.transition 1983, 9, :o2, 433299600
+          tz.transition 1984, 3, :o3, 449024400
+          tz.transition 1984, 9, :o2, 465354000
+          tz.transition 1985, 3, :o3, 481078800
+          tz.transition 1985, 9, :o2, 496803600
+          tz.transition 1986, 3, :o3, 512528400
+          tz.transition 1986, 9, :o2, 528253200
+          tz.transition 1987, 3, :o3, 543978000
+          tz.transition 1987, 9, :o2, 559702800
+          tz.transition 1988, 3, :o3, 575427600
+          tz.transition 1988, 9, :o2, 591152400
+          tz.transition 1989, 3, :o3, 606877200
+          tz.transition 1989, 9, :o2, 622602000
+          tz.transition 1990, 3, :o3, 638326800
+          tz.transition 1990, 9, :o2, 654656400
+          tz.transition 1991, 3, :o3, 670381200
+          tz.transition 1991, 9, :o2, 686106000
+          tz.transition 1992, 3, :o3, 701830800
+          tz.transition 1992, 9, :o2, 717555600
+          tz.transition 1993, 3, :o3, 733280400
+          tz.transition 1993, 9, :o2, 749005200
+          tz.transition 1994, 3, :o3, 764730000
+          tz.transition 1994, 9, :o2, 780454800
+          tz.transition 1995, 3, :o3, 796179600
+          tz.transition 1995, 9, :o2, 811904400
+          tz.transition 1996, 3, :o3, 828234000
+          tz.transition 1996, 10, :o2, 846378000
+          tz.transition 1997, 3, :o3, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o3, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o3, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o3, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o3, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o3, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o3, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o3, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o3, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o3, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Istanbul.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Istanbul.rb
new file mode 100644
index 00000000..8306c475
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Istanbul.rb
@@ -0,0 +1,218 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Istanbul
+        include TimezoneDefinition
+        
+        timezone 'Europe/Istanbul' do |tz|
+          tz.offset :o0, 6952, 0, :LMT
+          tz.offset :o1, 7016, 0, :IMT
+          tz.offset :o2, 7200, 0, :EET
+          tz.offset :o3, 7200, 3600, :EEST
+          tz.offset :o4, 10800, 3600, :TRST
+          tz.offset :o5, 10800, 0, :TRT
+          
+          tz.transition 1879, 12, :o1, 26003326531, 10800
+          tz.transition 1910, 9, :o2, 26124610523, 10800
+          tz.transition 1916, 4, :o3, 29051813, 12
+          tz.transition 1916, 9, :o2, 19369099, 8
+          tz.transition 1920, 3, :o3, 29068937, 12
+          tz.transition 1920, 10, :o2, 19380979, 8
+          tz.transition 1921, 4, :o3, 29073389, 12
+          tz.transition 1921, 10, :o2, 19383723, 8
+          tz.transition 1922, 3, :o3, 29077673, 12
+          tz.transition 1922, 10, :o2, 19386683, 8
+          tz.transition 1924, 5, :o3, 29087021, 12
+          tz.transition 1924, 9, :o2, 19392475, 8
+          tz.transition 1925, 4, :o3, 29091257, 12
+          tz.transition 1925, 9, :o2, 19395395, 8
+          tz.transition 1940, 6, :o3, 29157725, 12
+          tz.transition 1940, 10, :o2, 19439259, 8
+          tz.transition 1940, 11, :o3, 29159573, 12
+          tz.transition 1941, 9, :o2, 19442067, 8
+          tz.transition 1942, 3, :o3, 29165405, 12
+          tz.transition 1942, 10, :o2, 19445315, 8
+          tz.transition 1945, 4, :o3, 29178569, 12
+          tz.transition 1945, 10, :o2, 19453891, 8
+          tz.transition 1946, 5, :o3, 29183669, 12
+          tz.transition 1946, 9, :o2, 19456755, 8
+          tz.transition 1947, 4, :o3, 29187545, 12
+          tz.transition 1947, 10, :o2, 19459707, 8
+          tz.transition 1948, 4, :o3, 29191913, 12
+          tz.transition 1948, 10, :o2, 19462619, 8
+          tz.transition 1949, 4, :o3, 29196197, 12
+          tz.transition 1949, 10, :o2, 19465531, 8
+          tz.transition 1950, 4, :o3, 29200685, 12
+          tz.transition 1950, 10, :o2, 19468499, 8
+          tz.transition 1951, 4, :o3, 29205101, 12
+          tz.transition 1951, 10, :o2, 19471419, 8
+          tz.transition 1962, 7, :o3, 29254325, 12
+          tz.transition 1962, 10, :o2, 19503563, 8
+          tz.transition 1964, 5, :o3, 29262365, 12
+          tz.transition 1964, 9, :o2, 19509355, 8
+          tz.transition 1970, 5, :o3, 10533600
+          tz.transition 1970, 10, :o2, 23835600
+          tz.transition 1971, 5, :o3, 41983200
+          tz.transition 1971, 10, :o2, 55285200
+          tz.transition 1972, 5, :o3, 74037600
+          tz.transition 1972, 10, :o2, 87339600
+          tz.transition 1973, 6, :o3, 107910000
+          tz.transition 1973, 11, :o2, 121219200
+          tz.transition 1974, 3, :o3, 133920000
+          tz.transition 1974, 11, :o2, 152676000
+          tz.transition 1975, 3, :o3, 165362400
+          tz.transition 1975, 10, :o2, 183502800
+          tz.transition 1976, 5, :o3, 202428000
+          tz.transition 1976, 10, :o2, 215557200
+          tz.transition 1977, 4, :o3, 228866400
+          tz.transition 1977, 10, :o2, 245797200
+          tz.transition 1978, 4, :o3, 260316000
+          tz.transition 1978, 10, :o4, 277246800
+          tz.transition 1979, 10, :o5, 308779200
+          tz.transition 1980, 4, :o4, 323827200
+          tz.transition 1980, 10, :o5, 340228800
+          tz.transition 1981, 3, :o4, 354672000
+          tz.transition 1981, 10, :o5, 371678400
+          tz.transition 1982, 3, :o4, 386121600
+          tz.transition 1982, 10, :o5, 403128000
+          tz.transition 1983, 7, :o4, 428446800
+          tz.transition 1983, 10, :o5, 433886400
+          tz.transition 1985, 4, :o3, 482792400
+          tz.transition 1985, 9, :o2, 496702800
+          tz.transition 1986, 3, :o3, 512524800
+          tz.transition 1986, 9, :o2, 528249600
+          tz.transition 1987, 3, :o3, 543974400
+          tz.transition 1987, 9, :o2, 559699200
+          tz.transition 1988, 3, :o3, 575424000
+          tz.transition 1988, 9, :o2, 591148800
+          tz.transition 1989, 3, :o3, 606873600
+          tz.transition 1989, 9, :o2, 622598400
+          tz.transition 1990, 3, :o3, 638323200
+          tz.transition 1990, 9, :o2, 654652800
+          tz.transition 1991, 3, :o3, 670374000
+          tz.transition 1991, 9, :o2, 686098800
+          tz.transition 1992, 3, :o3, 701823600
+          tz.transition 1992, 9, :o2, 717548400
+          tz.transition 1993, 3, :o3, 733273200
+          tz.transition 1993, 9, :o2, 748998000
+          tz.transition 1994, 3, :o3, 764722800
+          tz.transition 1994, 9, :o2, 780447600
+          tz.transition 1995, 3, :o3, 796172400
+          tz.transition 1995, 9, :o2, 811897200
+          tz.transition 1996, 3, :o3, 828226800
+          tz.transition 1996, 10, :o2, 846370800
+          tz.transition 1997, 3, :o3, 859676400
+          tz.transition 1997, 10, :o2, 877820400
+          tz.transition 1998, 3, :o3, 891126000
+          tz.transition 1998, 10, :o2, 909270000
+          tz.transition 1999, 3, :o3, 922575600
+          tz.transition 1999, 10, :o2, 941324400
+          tz.transition 2000, 3, :o3, 954025200
+          tz.transition 2000, 10, :o2, 972774000
+          tz.transition 2001, 3, :o3, 985474800
+          tz.transition 2001, 10, :o2, 1004223600
+          tz.transition 2002, 3, :o3, 1017529200
+          tz.transition 2002, 10, :o2, 1035673200
+          tz.transition 2003, 3, :o3, 1048978800
+          tz.transition 2003, 10, :o2, 1067122800
+          tz.transition 2004, 3, :o3, 1080428400
+          tz.transition 2004, 10, :o2, 1099177200
+          tz.transition 2005, 3, :o3, 1111878000
+          tz.transition 2005, 10, :o2, 1130626800
+          tz.transition 2006, 3, :o3, 1143327600
+          tz.transition 2006, 10, :o2, 1162076400
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Kiev.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Kiev.rb
new file mode 100644
index 00000000..513d3308
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Kiev.rb
@@ -0,0 +1,168 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Kiev
+        include TimezoneDefinition
+        
+        timezone 'Europe/Kiev' do |tz|
+          tz.offset :o0, 7324, 0, :LMT
+          tz.offset :o1, 7324, 0, :KMT
+          tz.offset :o2, 7200, 0, :EET
+          tz.offset :o3, 10800, 0, :MSK
+          tz.offset :o4, 3600, 3600, :CEST
+          tz.offset :o5, 3600, 0, :CET
+          tz.offset :o6, 10800, 3600, :MSD
+          tz.offset :o7, 7200, 3600, :EEST
+          
+          tz.transition 1879, 12, :o1, 52006652969, 21600
+          tz.transition 1924, 5, :o2, 52356400169, 21600
+          tz.transition 1930, 6, :o3, 29113781, 12
+          tz.transition 1941, 9, :o4, 19442059, 8
+          tz.transition 1942, 11, :o5, 58335973, 24
+          tz.transition 1943, 3, :o4, 58339501, 24
+          tz.transition 1943, 10, :o5, 58344037, 24
+          tz.transition 1943, 11, :o3, 58344827, 24
+          tz.transition 1981, 3, :o6, 354920400
+          tz.transition 1981, 9, :o3, 370728000
+          tz.transition 1982, 3, :o6, 386456400
+          tz.transition 1982, 9, :o3, 402264000
+          tz.transition 1983, 3, :o6, 417992400
+          tz.transition 1983, 9, :o3, 433800000
+          tz.transition 1984, 3, :o6, 449614800
+          tz.transition 1984, 9, :o3, 465346800
+          tz.transition 1985, 3, :o6, 481071600
+          tz.transition 1985, 9, :o3, 496796400
+          tz.transition 1986, 3, :o6, 512521200
+          tz.transition 1986, 9, :o3, 528246000
+          tz.transition 1987, 3, :o6, 543970800
+          tz.transition 1987, 9, :o3, 559695600
+          tz.transition 1988, 3, :o6, 575420400
+          tz.transition 1988, 9, :o3, 591145200
+          tz.transition 1989, 3, :o6, 606870000
+          tz.transition 1989, 9, :o3, 622594800
+          tz.transition 1990, 6, :o2, 646786800
+          tz.transition 1992, 3, :o7, 701820000
+          tz.transition 1992, 9, :o2, 717541200
+          tz.transition 1993, 3, :o7, 733269600
+          tz.transition 1993, 9, :o2, 748990800
+          tz.transition 1994, 3, :o7, 764719200
+          tz.transition 1994, 9, :o2, 780440400
+          tz.transition 1995, 3, :o7, 796179600
+          tz.transition 1995, 9, :o2, 811904400
+          tz.transition 1996, 3, :o7, 828234000
+          tz.transition 1996, 10, :o2, 846378000
+          tz.transition 1997, 3, :o7, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o7, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o7, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o7, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o7, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o7, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o7, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o7, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o7, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o7, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o7, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o7, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o7, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o7, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o7, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o7, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o7, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o7, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o7, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o7, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o7, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o7, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o7, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o7, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o7, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o7, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o7, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o7, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o7, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o7, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o7, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o7, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o7, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o7, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o7, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o7, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o7, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o7, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o7, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o7, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o7, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o7, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o7, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o7, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o7, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o7, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o7, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o7, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o7, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o7, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o7, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o7, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o7, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o7, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Lisbon.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Lisbon.rb
new file mode 100644
index 00000000..1c6d2a3d
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Lisbon.rb
@@ -0,0 +1,268 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Lisbon
+        include TimezoneDefinition
+        
+        timezone 'Europe/Lisbon' do |tz|
+          tz.offset :o0, -2192, 0, :LMT
+          tz.offset :o1, 0, 0, :WET
+          tz.offset :o2, 0, 3600, :WEST
+          tz.offset :o3, 0, 7200, :WEMT
+          tz.offset :o4, 3600, 0, :CET
+          tz.offset :o5, 3600, 3600, :CEST
+          
+          tz.transition 1912, 1, :o1, 13064773637, 5400
+          tz.transition 1916, 6, :o2, 58104779, 24
+          tz.transition 1916, 11, :o1, 4842337, 2
+          tz.transition 1917, 2, :o2, 58110923, 24
+          tz.transition 1917, 10, :o1, 58116395, 24
+          tz.transition 1918, 3, :o2, 58119707, 24
+          tz.transition 1918, 10, :o1, 58125155, 24
+          tz.transition 1919, 2, :o2, 58128443, 24
+          tz.transition 1919, 10, :o1, 58133915, 24
+          tz.transition 1920, 2, :o2, 58137227, 24
+          tz.transition 1920, 10, :o1, 58142699, 24
+          tz.transition 1921, 2, :o2, 58145987, 24
+          tz.transition 1921, 10, :o1, 58151459, 24
+          tz.transition 1924, 4, :o2, 58173419, 24
+          tz.transition 1924, 10, :o1, 58177763, 24
+          tz.transition 1926, 4, :o2, 58190963, 24
+          tz.transition 1926, 10, :o1, 58194995, 24
+          tz.transition 1927, 4, :o2, 58199531, 24
+          tz.transition 1927, 10, :o1, 58203731, 24
+          tz.transition 1928, 4, :o2, 58208435, 24
+          tz.transition 1928, 10, :o1, 58212635, 24
+          tz.transition 1929, 4, :o2, 58217339, 24
+          tz.transition 1929, 10, :o1, 58221371, 24
+          tz.transition 1931, 4, :o2, 58234811, 24
+          tz.transition 1931, 10, :o1, 58238843, 24
+          tz.transition 1932, 4, :o2, 58243211, 24
+          tz.transition 1932, 10, :o1, 58247579, 24
+          tz.transition 1934, 4, :o2, 58260851, 24
+          tz.transition 1934, 10, :o1, 58265219, 24
+          tz.transition 1935, 3, :o2, 58269419, 24
+          tz.transition 1935, 10, :o1, 58273955, 24
+          tz.transition 1936, 4, :o2, 58278659, 24
+          tz.transition 1936, 10, :o1, 58282691, 24
+          tz.transition 1937, 4, :o2, 58287059, 24
+          tz.transition 1937, 10, :o1, 58291427, 24
+          tz.transition 1938, 3, :o2, 58295627, 24
+          tz.transition 1938, 10, :o1, 58300163, 24
+          tz.transition 1939, 4, :o2, 58304867, 24
+          tz.transition 1939, 11, :o1, 58310075, 24
+          tz.transition 1940, 2, :o2, 58312427, 24
+          tz.transition 1940, 10, :o1, 58317803, 24
+          tz.transition 1941, 4, :o2, 58322171, 24
+          tz.transition 1941, 10, :o1, 58326563, 24
+          tz.transition 1942, 3, :o2, 58330403, 24
+          tz.transition 1942, 4, :o3, 29165705, 12
+          tz.transition 1942, 8, :o2, 29167049, 12
+          tz.transition 1942, 10, :o1, 58335779, 24
+          tz.transition 1943, 3, :o2, 58339139, 24
+          tz.transition 1943, 4, :o3, 29169989, 12
+          tz.transition 1943, 8, :o2, 29171585, 12
+          tz.transition 1943, 10, :o1, 58344683, 24
+          tz.transition 1944, 3, :o2, 58347875, 24
+          tz.transition 1944, 4, :o3, 29174441, 12
+          tz.transition 1944, 8, :o2, 29175953, 12
+          tz.transition 1944, 10, :o1, 58353419, 24
+          tz.transition 1945, 3, :o2, 58356611, 24
+          tz.transition 1945, 4, :o3, 29178809, 12
+          tz.transition 1945, 8, :o2, 29180321, 12
+          tz.transition 1945, 10, :o1, 58362155, 24
+          tz.transition 1946, 4, :o2, 58366019, 24
+          tz.transition 1946, 10, :o1, 58370387, 24
+          tz.transition 1947, 4, :o2, 29187379, 12
+          tz.transition 1947, 10, :o1, 29189563, 12
+          tz.transition 1948, 4, :o2, 29191747, 12
+          tz.transition 1948, 10, :o1, 29193931, 12
+          tz.transition 1949, 4, :o2, 29196115, 12
+          tz.transition 1949, 10, :o1, 29198299, 12
+          tz.transition 1951, 4, :o2, 29204851, 12
+          tz.transition 1951, 10, :o1, 29207119, 12
+          tz.transition 1952, 4, :o2, 29209303, 12
+          tz.transition 1952, 10, :o1, 29211487, 12
+          tz.transition 1953, 4, :o2, 29213671, 12
+          tz.transition 1953, 10, :o1, 29215855, 12
+          tz.transition 1954, 4, :o2, 29218039, 12
+          tz.transition 1954, 10, :o1, 29220223, 12
+          tz.transition 1955, 4, :o2, 29222407, 12
+          tz.transition 1955, 10, :o1, 29224591, 12
+          tz.transition 1956, 4, :o2, 29226775, 12
+          tz.transition 1956, 10, :o1, 29229043, 12
+          tz.transition 1957, 4, :o2, 29231227, 12
+          tz.transition 1957, 10, :o1, 29233411, 12
+          tz.transition 1958, 4, :o2, 29235595, 12
+          tz.transition 1958, 10, :o1, 29237779, 12
+          tz.transition 1959, 4, :o2, 29239963, 12
+          tz.transition 1959, 10, :o1, 29242147, 12
+          tz.transition 1960, 4, :o2, 29244331, 12
+          tz.transition 1960, 10, :o1, 29246515, 12
+          tz.transition 1961, 4, :o2, 29248699, 12
+          tz.transition 1961, 10, :o1, 29250883, 12
+          tz.transition 1962, 4, :o2, 29253067, 12
+          tz.transition 1962, 10, :o1, 29255335, 12
+          tz.transition 1963, 4, :o2, 29257519, 12
+          tz.transition 1963, 10, :o1, 29259703, 12
+          tz.transition 1964, 4, :o2, 29261887, 12
+          tz.transition 1964, 10, :o1, 29264071, 12
+          tz.transition 1965, 4, :o2, 29266255, 12
+          tz.transition 1965, 10, :o1, 29268439, 12
+          tz.transition 1966, 4, :o4, 29270623, 12
+          tz.transition 1976, 9, :o1, 212544000
+          tz.transition 1977, 3, :o2, 228268800
+          tz.transition 1977, 9, :o1, 243993600
+          tz.transition 1978, 4, :o2, 260323200
+          tz.transition 1978, 10, :o1, 276048000
+          tz.transition 1979, 4, :o2, 291772800
+          tz.transition 1979, 9, :o1, 307501200
+          tz.transition 1980, 3, :o2, 323222400
+          tz.transition 1980, 9, :o1, 338950800
+          tz.transition 1981, 3, :o2, 354675600
+          tz.transition 1981, 9, :o1, 370400400
+          tz.transition 1982, 3, :o2, 386125200
+          tz.transition 1982, 9, :o1, 401850000
+          tz.transition 1983, 3, :o2, 417578400
+          tz.transition 1983, 9, :o1, 433299600
+          tz.transition 1984, 3, :o2, 449024400
+          tz.transition 1984, 9, :o1, 465354000
+          tz.transition 1985, 3, :o2, 481078800
+          tz.transition 1985, 9, :o1, 496803600
+          tz.transition 1986, 3, :o2, 512528400
+          tz.transition 1986, 9, :o1, 528253200
+          tz.transition 1987, 3, :o2, 543978000
+          tz.transition 1987, 9, :o1, 559702800
+          tz.transition 1988, 3, :o2, 575427600
+          tz.transition 1988, 9, :o1, 591152400
+          tz.transition 1989, 3, :o2, 606877200
+          tz.transition 1989, 9, :o1, 622602000
+          tz.transition 1990, 3, :o2, 638326800
+          tz.transition 1990, 9, :o1, 654656400
+          tz.transition 1991, 3, :o2, 670381200
+          tz.transition 1991, 9, :o1, 686106000
+          tz.transition 1992, 3, :o2, 701830800
+          tz.transition 1992, 9, :o4, 717555600
+          tz.transition 1993, 3, :o5, 733280400
+          tz.transition 1993, 9, :o4, 749005200
+          tz.transition 1994, 3, :o5, 764730000
+          tz.transition 1994, 9, :o4, 780454800
+          tz.transition 1995, 3, :o5, 796179600
+          tz.transition 1995, 9, :o4, 811904400
+          tz.transition 1996, 3, :o2, 828234000
+          tz.transition 1996, 10, :o1, 846378000
+          tz.transition 1997, 3, :o2, 859683600
+          tz.transition 1997, 10, :o1, 877827600
+          tz.transition 1998, 3, :o2, 891133200
+          tz.transition 1998, 10, :o1, 909277200
+          tz.transition 1999, 3, :o2, 922582800
+          tz.transition 1999, 10, :o1, 941331600
+          tz.transition 2000, 3, :o2, 954032400
+          tz.transition 2000, 10, :o1, 972781200
+          tz.transition 2001, 3, :o2, 985482000
+          tz.transition 2001, 10, :o1, 1004230800
+          tz.transition 2002, 3, :o2, 1017536400
+          tz.transition 2002, 10, :o1, 1035680400
+          tz.transition 2003, 3, :o2, 1048986000
+          tz.transition 2003, 10, :o1, 1067130000
+          tz.transition 2004, 3, :o2, 1080435600
+          tz.transition 2004, 10, :o1, 1099184400
+          tz.transition 2005, 3, :o2, 1111885200
+          tz.transition 2005, 10, :o1, 1130634000
+          tz.transition 2006, 3, :o2, 1143334800
+          tz.transition 2006, 10, :o1, 1162083600
+          tz.transition 2007, 3, :o2, 1174784400
+          tz.transition 2007, 10, :o1, 1193533200
+          tz.transition 2008, 3, :o2, 1206838800
+          tz.transition 2008, 10, :o1, 1224982800
+          tz.transition 2009, 3, :o2, 1238288400
+          tz.transition 2009, 10, :o1, 1256432400
+          tz.transition 2010, 3, :o2, 1269738000
+          tz.transition 2010, 10, :o1, 1288486800
+          tz.transition 2011, 3, :o2, 1301187600
+          tz.transition 2011, 10, :o1, 1319936400
+          tz.transition 2012, 3, :o2, 1332637200
+          tz.transition 2012, 10, :o1, 1351386000
+          tz.transition 2013, 3, :o2, 1364691600
+          tz.transition 2013, 10, :o1, 1382835600
+          tz.transition 2014, 3, :o2, 1396141200
+          tz.transition 2014, 10, :o1, 1414285200
+          tz.transition 2015, 3, :o2, 1427590800
+          tz.transition 2015, 10, :o1, 1445734800
+          tz.transition 2016, 3, :o2, 1459040400
+          tz.transition 2016, 10, :o1, 1477789200
+          tz.transition 2017, 3, :o2, 1490490000
+          tz.transition 2017, 10, :o1, 1509238800
+          tz.transition 2018, 3, :o2, 1521939600
+          tz.transition 2018, 10, :o1, 1540688400
+          tz.transition 2019, 3, :o2, 1553994000
+          tz.transition 2019, 10, :o1, 1572138000
+          tz.transition 2020, 3, :o2, 1585443600
+          tz.transition 2020, 10, :o1, 1603587600
+          tz.transition 2021, 3, :o2, 1616893200
+          tz.transition 2021, 10, :o1, 1635642000
+          tz.transition 2022, 3, :o2, 1648342800
+          tz.transition 2022, 10, :o1, 1667091600
+          tz.transition 2023, 3, :o2, 1679792400
+          tz.transition 2023, 10, :o1, 1698541200
+          tz.transition 2024, 3, :o2, 1711846800
+          tz.transition 2024, 10, :o1, 1729990800
+          tz.transition 2025, 3, :o2, 1743296400
+          tz.transition 2025, 10, :o1, 1761440400
+          tz.transition 2026, 3, :o2, 1774746000
+          tz.transition 2026, 10, :o1, 1792890000
+          tz.transition 2027, 3, :o2, 1806195600
+          tz.transition 2027, 10, :o1, 1824944400
+          tz.transition 2028, 3, :o2, 1837645200
+          tz.transition 2028, 10, :o1, 1856394000
+          tz.transition 2029, 3, :o2, 1869094800
+          tz.transition 2029, 10, :o1, 1887843600
+          tz.transition 2030, 3, :o2, 1901149200
+          tz.transition 2030, 10, :o1, 1919293200
+          tz.transition 2031, 3, :o2, 1932598800
+          tz.transition 2031, 10, :o1, 1950742800
+          tz.transition 2032, 3, :o2, 1964048400
+          tz.transition 2032, 10, :o1, 1982797200
+          tz.transition 2033, 3, :o2, 1995498000
+          tz.transition 2033, 10, :o1, 2014246800
+          tz.transition 2034, 3, :o2, 2026947600
+          tz.transition 2034, 10, :o1, 2045696400
+          tz.transition 2035, 3, :o2, 2058397200
+          tz.transition 2035, 10, :o1, 2077146000
+          tz.transition 2036, 3, :o2, 2090451600
+          tz.transition 2036, 10, :o1, 2108595600
+          tz.transition 2037, 3, :o2, 2121901200
+          tz.transition 2037, 10, :o1, 2140045200
+          tz.transition 2038, 3, :o2, 59172253, 24
+          tz.transition 2038, 10, :o1, 59177461, 24
+          tz.transition 2039, 3, :o2, 59180989, 24
+          tz.transition 2039, 10, :o1, 59186197, 24
+          tz.transition 2040, 3, :o2, 59189725, 24
+          tz.transition 2040, 10, :o1, 59194933, 24
+          tz.transition 2041, 3, :o2, 59198629, 24
+          tz.transition 2041, 10, :o1, 59203669, 24
+          tz.transition 2042, 3, :o2, 59207365, 24
+          tz.transition 2042, 10, :o1, 59212405, 24
+          tz.transition 2043, 3, :o2, 59216101, 24
+          tz.transition 2043, 10, :o1, 59221141, 24
+          tz.transition 2044, 3, :o2, 59224837, 24
+          tz.transition 2044, 10, :o1, 59230045, 24
+          tz.transition 2045, 3, :o2, 59233573, 24
+          tz.transition 2045, 10, :o1, 59238781, 24
+          tz.transition 2046, 3, :o2, 59242309, 24
+          tz.transition 2046, 10, :o1, 59247517, 24
+          tz.transition 2047, 3, :o2, 59251213, 24
+          tz.transition 2047, 10, :o1, 59256253, 24
+          tz.transition 2048, 3, :o2, 59259949, 24
+          tz.transition 2048, 10, :o1, 59264989, 24
+          tz.transition 2049, 3, :o2, 59268685, 24
+          tz.transition 2049, 10, :o1, 59273893, 24
+          tz.transition 2050, 3, :o2, 59277421, 24
+          tz.transition 2050, 10, :o1, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Ljubljana.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Ljubljana.rb
new file mode 100644
index 00000000..a9828e6e
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Ljubljana.rb
@@ -0,0 +1,13 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Ljubljana
+        include TimezoneDefinition
+        
+        linked_timezone 'Europe/Ljubljana', 'Europe/Belgrade'
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/London.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/London.rb
new file mode 100644
index 00000000..64ce41e9
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/London.rb
@@ -0,0 +1,288 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module London
+        include TimezoneDefinition
+        
+        timezone 'Europe/London' do |tz|
+          tz.offset :o0, -75, 0, :LMT
+          tz.offset :o1, 0, 0, :GMT
+          tz.offset :o2, 0, 3600, :BST
+          tz.offset :o3, 0, 7200, :BDST
+          tz.offset :o4, 3600, 0, :BST
+          
+          tz.transition 1847, 12, :o1, 2760187969, 1152
+          tz.transition 1916, 5, :o2, 29052055, 12
+          tz.transition 1916, 10, :o1, 29053651, 12
+          tz.transition 1917, 4, :o2, 29055919, 12
+          tz.transition 1917, 9, :o1, 29057863, 12
+          tz.transition 1918, 3, :o2, 29060119, 12
+          tz.transition 1918, 9, :o1, 29062399, 12
+          tz.transition 1919, 3, :o2, 29064571, 12
+          tz.transition 1919, 9, :o1, 29066767, 12
+          tz.transition 1920, 3, :o2, 29068939, 12
+          tz.transition 1920, 10, :o1, 29071471, 12
+          tz.transition 1921, 4, :o2, 29073391, 12
+          tz.transition 1921, 10, :o1, 29075587, 12
+          tz.transition 1922, 3, :o2, 29077675, 12
+          tz.transition 1922, 10, :o1, 29080027, 12
+          tz.transition 1923, 4, :o2, 29082379, 12
+          tz.transition 1923, 9, :o1, 29084143, 12
+          tz.transition 1924, 4, :o2, 29086663, 12
+          tz.transition 1924, 9, :o1, 29088595, 12
+          tz.transition 1925, 4, :o2, 29091115, 12
+          tz.transition 1925, 10, :o1, 29093131, 12
+          tz.transition 1926, 4, :o2, 29095483, 12
+          tz.transition 1926, 10, :o1, 29097499, 12
+          tz.transition 1927, 4, :o2, 29099767, 12
+          tz.transition 1927, 10, :o1, 29101867, 12
+          tz.transition 1928, 4, :o2, 29104303, 12
+          tz.transition 1928, 10, :o1, 29106319, 12
+          tz.transition 1929, 4, :o2, 29108671, 12
+          tz.transition 1929, 10, :o1, 29110687, 12
+          tz.transition 1930, 4, :o2, 29112955, 12
+          tz.transition 1930, 10, :o1, 29115055, 12
+          tz.transition 1931, 4, :o2, 29117407, 12
+          tz.transition 1931, 10, :o1, 29119423, 12
+          tz.transition 1932, 4, :o2, 29121775, 12
+          tz.transition 1932, 10, :o1, 29123791, 12
+          tz.transition 1933, 4, :o2, 29126059, 12
+          tz.transition 1933, 10, :o1, 29128243, 12
+          tz.transition 1934, 4, :o2, 29130595, 12
+          tz.transition 1934, 10, :o1, 29132611, 12
+          tz.transition 1935, 4, :o2, 29134879, 12
+          tz.transition 1935, 10, :o1, 29136979, 12
+          tz.transition 1936, 4, :o2, 29139331, 12
+          tz.transition 1936, 10, :o1, 29141347, 12
+          tz.transition 1937, 4, :o2, 29143699, 12
+          tz.transition 1937, 10, :o1, 29145715, 12
+          tz.transition 1938, 4, :o2, 29147983, 12
+          tz.transition 1938, 10, :o1, 29150083, 12
+          tz.transition 1939, 4, :o2, 29152435, 12
+          tz.transition 1939, 11, :o1, 29155039, 12
+          tz.transition 1940, 2, :o2, 29156215, 12
+          tz.transition 1941, 5, :o3, 58322845, 24
+          tz.transition 1941, 8, :o2, 58325197, 24
+          tz.transition 1942, 4, :o3, 58330909, 24
+          tz.transition 1942, 8, :o2, 58333933, 24
+          tz.transition 1943, 4, :o3, 58339645, 24
+          tz.transition 1943, 8, :o2, 58342837, 24
+          tz.transition 1944, 4, :o3, 58348381, 24
+          tz.transition 1944, 9, :o2, 58352413, 24
+          tz.transition 1945, 4, :o3, 58357141, 24
+          tz.transition 1945, 7, :o2, 58359637, 24
+          tz.transition 1945, 10, :o1, 29180827, 12
+          tz.transition 1946, 4, :o2, 29183095, 12
+          tz.transition 1946, 10, :o1, 29185195, 12
+          tz.transition 1947, 3, :o2, 29187127, 12
+          tz.transition 1947, 4, :o3, 58374925, 24
+          tz.transition 1947, 8, :o2, 58377781, 24
+          tz.transition 1947, 11, :o1, 29189899, 12
+          tz.transition 1948, 3, :o2, 29191495, 12
+          tz.transition 1948, 10, :o1, 29194267, 12
+          tz.transition 1949, 4, :o2, 29196115, 12
+          tz.transition 1949, 10, :o1, 29198635, 12
+          tz.transition 1950, 4, :o2, 29200651, 12
+          tz.transition 1950, 10, :o1, 29202919, 12
+          tz.transition 1951, 4, :o2, 29205019, 12
+          tz.transition 1951, 10, :o1, 29207287, 12
+          tz.transition 1952, 4, :o2, 29209471, 12
+          tz.transition 1952, 10, :o1, 29211739, 12
+          tz.transition 1953, 4, :o2, 29213839, 12
+          tz.transition 1953, 10, :o1, 29215855, 12
+          tz.transition 1954, 4, :o2, 29218123, 12
+          tz.transition 1954, 10, :o1, 29220223, 12
+          tz.transition 1955, 4, :o2, 29222575, 12
+          tz.transition 1955, 10, :o1, 29224591, 12
+          tz.transition 1956, 4, :o2, 29227027, 12
+          tz.transition 1956, 10, :o1, 29229043, 12
+          tz.transition 1957, 4, :o2, 29231311, 12
+          tz.transition 1957, 10, :o1, 29233411, 12
+          tz.transition 1958, 4, :o2, 29235763, 12
+          tz.transition 1958, 10, :o1, 29237779, 12
+          tz.transition 1959, 4, :o2, 29240131, 12
+          tz.transition 1959, 10, :o1, 29242147, 12
+          tz.transition 1960, 4, :o2, 29244415, 12
+          tz.transition 1960, 10, :o1, 29246515, 12
+          tz.transition 1961, 3, :o2, 29248615, 12
+          tz.transition 1961, 10, :o1, 29251219, 12
+          tz.transition 1962, 3, :o2, 29252983, 12
+          tz.transition 1962, 10, :o1, 29255587, 12
+          tz.transition 1963, 3, :o2, 29257435, 12
+          tz.transition 1963, 10, :o1, 29259955, 12
+          tz.transition 1964, 3, :o2, 29261719, 12
+          tz.transition 1964, 10, :o1, 29264323, 12
+          tz.transition 1965, 3, :o2, 29266087, 12
+          tz.transition 1965, 10, :o1, 29268691, 12
+          tz.transition 1966, 3, :o2, 29270455, 12
+          tz.transition 1966, 10, :o1, 29273059, 12
+          tz.transition 1967, 3, :o2, 29274823, 12
+          tz.transition 1967, 10, :o1, 29277511, 12
+          tz.transition 1968, 2, :o2, 29278855, 12
+          tz.transition 1968, 10, :o4, 58563755, 24
+          tz.transition 1971, 10, :o1, 57722400
+          tz.transition 1972, 3, :o2, 69818400
+          tz.transition 1972, 10, :o1, 89172000
+          tz.transition 1973, 3, :o2, 101268000
+          tz.transition 1973, 10, :o1, 120621600
+          tz.transition 1974, 3, :o2, 132717600
+          tz.transition 1974, 10, :o1, 152071200
+          tz.transition 1975, 3, :o2, 164167200
+          tz.transition 1975, 10, :o1, 183520800
+          tz.transition 1976, 3, :o2, 196221600
+          tz.transition 1976, 10, :o1, 214970400
+          tz.transition 1977, 3, :o2, 227671200
+          tz.transition 1977, 10, :o1, 246420000
+          tz.transition 1978, 3, :o2, 259120800
+          tz.transition 1978, 10, :o1, 278474400
+          tz.transition 1979, 3, :o2, 290570400
+          tz.transition 1979, 10, :o1, 309924000
+          tz.transition 1980, 3, :o2, 322020000
+          tz.transition 1980, 10, :o1, 341373600
+          tz.transition 1981, 3, :o2, 354675600
+          tz.transition 1981, 10, :o1, 372819600
+          tz.transition 1982, 3, :o2, 386125200
+          tz.transition 1982, 10, :o1, 404269200
+          tz.transition 1983, 3, :o2, 417574800
+          tz.transition 1983, 10, :o1, 435718800
+          tz.transition 1984, 3, :o2, 449024400
+          tz.transition 1984, 10, :o1, 467773200
+          tz.transition 1985, 3, :o2, 481078800
+          tz.transition 1985, 10, :o1, 499222800
+          tz.transition 1986, 3, :o2, 512528400
+          tz.transition 1986, 10, :o1, 530672400
+          tz.transition 1987, 3, :o2, 543978000
+          tz.transition 1987, 10, :o1, 562122000
+          tz.transition 1988, 3, :o2, 575427600
+          tz.transition 1988, 10, :o1, 593571600
+          tz.transition 1989, 3, :o2, 606877200
+          tz.transition 1989, 10, :o1, 625626000
+          tz.transition 1990, 3, :o2, 638326800
+          tz.transition 1990, 10, :o1, 657075600
+          tz.transition 1991, 3, :o2, 670381200
+          tz.transition 1991, 10, :o1, 688525200
+          tz.transition 1992, 3, :o2, 701830800
+          tz.transition 1992, 10, :o1, 719974800
+          tz.transition 1993, 3, :o2, 733280400
+          tz.transition 1993, 10, :o1, 751424400
+          tz.transition 1994, 3, :o2, 764730000
+          tz.transition 1994, 10, :o1, 782874000
+          tz.transition 1995, 3, :o2, 796179600
+          tz.transition 1995, 10, :o1, 814323600
+          tz.transition 1996, 3, :o2, 828234000
+          tz.transition 1996, 10, :o1, 846378000
+          tz.transition 1997, 3, :o2, 859683600
+          tz.transition 1997, 10, :o1, 877827600
+          tz.transition 1998, 3, :o2, 891133200
+          tz.transition 1998, 10, :o1, 909277200
+          tz.transition 1999, 3, :o2, 922582800
+          tz.transition 1999, 10, :o1, 941331600
+          tz.transition 2000, 3, :o2, 954032400
+          tz.transition 2000, 10, :o1, 972781200
+          tz.transition 2001, 3, :o2, 985482000
+          tz.transition 2001, 10, :o1, 1004230800
+          tz.transition 2002, 3, :o2, 1017536400
+          tz.transition 2002, 10, :o1, 1035680400
+          tz.transition 2003, 3, :o2, 1048986000
+          tz.transition 2003, 10, :o1, 1067130000
+          tz.transition 2004, 3, :o2, 1080435600
+          tz.transition 2004, 10, :o1, 1099184400
+          tz.transition 2005, 3, :o2, 1111885200
+          tz.transition 2005, 10, :o1, 1130634000
+          tz.transition 2006, 3, :o2, 1143334800
+          tz.transition 2006, 10, :o1, 1162083600
+          tz.transition 2007, 3, :o2, 1174784400
+          tz.transition 2007, 10, :o1, 1193533200
+          tz.transition 2008, 3, :o2, 1206838800
+          tz.transition 2008, 10, :o1, 1224982800
+          tz.transition 2009, 3, :o2, 1238288400
+          tz.transition 2009, 10, :o1, 1256432400
+          tz.transition 2010, 3, :o2, 1269738000
+          tz.transition 2010, 10, :o1, 1288486800
+          tz.transition 2011, 3, :o2, 1301187600
+          tz.transition 2011, 10, :o1, 1319936400
+          tz.transition 2012, 3, :o2, 1332637200
+          tz.transition 2012, 10, :o1, 1351386000
+          tz.transition 2013, 3, :o2, 1364691600
+          tz.transition 2013, 10, :o1, 1382835600
+          tz.transition 2014, 3, :o2, 1396141200
+          tz.transition 2014, 10, :o1, 1414285200
+          tz.transition 2015, 3, :o2, 1427590800
+          tz.transition 2015, 10, :o1, 1445734800
+          tz.transition 2016, 3, :o2, 1459040400
+          tz.transition 2016, 10, :o1, 1477789200
+          tz.transition 2017, 3, :o2, 1490490000
+          tz.transition 2017, 10, :o1, 1509238800
+          tz.transition 2018, 3, :o2, 1521939600
+          tz.transition 2018, 10, :o1, 1540688400
+          tz.transition 2019, 3, :o2, 1553994000
+          tz.transition 2019, 10, :o1, 1572138000
+          tz.transition 2020, 3, :o2, 1585443600
+          tz.transition 2020, 10, :o1, 1603587600
+          tz.transition 2021, 3, :o2, 1616893200
+          tz.transition 2021, 10, :o1, 1635642000
+          tz.transition 2022, 3, :o2, 1648342800
+          tz.transition 2022, 10, :o1, 1667091600
+          tz.transition 2023, 3, :o2, 1679792400
+          tz.transition 2023, 10, :o1, 1698541200
+          tz.transition 2024, 3, :o2, 1711846800
+          tz.transition 2024, 10, :o1, 1729990800
+          tz.transition 2025, 3, :o2, 1743296400
+          tz.transition 2025, 10, :o1, 1761440400
+          tz.transition 2026, 3, :o2, 1774746000
+          tz.transition 2026, 10, :o1, 1792890000
+          tz.transition 2027, 3, :o2, 1806195600
+          tz.transition 2027, 10, :o1, 1824944400
+          tz.transition 2028, 3, :o2, 1837645200
+          tz.transition 2028, 10, :o1, 1856394000
+          tz.transition 2029, 3, :o2, 1869094800
+          tz.transition 2029, 10, :o1, 1887843600
+          tz.transition 2030, 3, :o2, 1901149200
+          tz.transition 2030, 10, :o1, 1919293200
+          tz.transition 2031, 3, :o2, 1932598800
+          tz.transition 2031, 10, :o1, 1950742800
+          tz.transition 2032, 3, :o2, 1964048400
+          tz.transition 2032, 10, :o1, 1982797200
+          tz.transition 2033, 3, :o2, 1995498000
+          tz.transition 2033, 10, :o1, 2014246800
+          tz.transition 2034, 3, :o2, 2026947600
+          tz.transition 2034, 10, :o1, 2045696400
+          tz.transition 2035, 3, :o2, 2058397200
+          tz.transition 2035, 10, :o1, 2077146000
+          tz.transition 2036, 3, :o2, 2090451600
+          tz.transition 2036, 10, :o1, 2108595600
+          tz.transition 2037, 3, :o2, 2121901200
+          tz.transition 2037, 10, :o1, 2140045200
+          tz.transition 2038, 3, :o2, 59172253, 24
+          tz.transition 2038, 10, :o1, 59177461, 24
+          tz.transition 2039, 3, :o2, 59180989, 24
+          tz.transition 2039, 10, :o1, 59186197, 24
+          tz.transition 2040, 3, :o2, 59189725, 24
+          tz.transition 2040, 10, :o1, 59194933, 24
+          tz.transition 2041, 3, :o2, 59198629, 24
+          tz.transition 2041, 10, :o1, 59203669, 24
+          tz.transition 2042, 3, :o2, 59207365, 24
+          tz.transition 2042, 10, :o1, 59212405, 24
+          tz.transition 2043, 3, :o2, 59216101, 24
+          tz.transition 2043, 10, :o1, 59221141, 24
+          tz.transition 2044, 3, :o2, 59224837, 24
+          tz.transition 2044, 10, :o1, 59230045, 24
+          tz.transition 2045, 3, :o2, 59233573, 24
+          tz.transition 2045, 10, :o1, 59238781, 24
+          tz.transition 2046, 3, :o2, 59242309, 24
+          tz.transition 2046, 10, :o1, 59247517, 24
+          tz.transition 2047, 3, :o2, 59251213, 24
+          tz.transition 2047, 10, :o1, 59256253, 24
+          tz.transition 2048, 3, :o2, 59259949, 24
+          tz.transition 2048, 10, :o1, 59264989, 24
+          tz.transition 2049, 3, :o2, 59268685, 24
+          tz.transition 2049, 10, :o1, 59273893, 24
+          tz.transition 2050, 3, :o2, 59277421, 24
+          tz.transition 2050, 10, :o1, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Madrid.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Madrid.rb
new file mode 100644
index 00000000..1fb56823
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Madrid.rb
@@ -0,0 +1,211 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Madrid
+        include TimezoneDefinition
+        
+        timezone 'Europe/Madrid' do |tz|
+          tz.offset :o0, -884, 0, :LMT
+          tz.offset :o1, 0, 0, :WET
+          tz.offset :o2, 0, 3600, :WEST
+          tz.offset :o3, 0, 7200, :WEMT
+          tz.offset :o4, 3600, 0, :CET
+          tz.offset :o5, 3600, 3600, :CEST
+          
+          tz.transition 1901, 1, :o1, 52172327021, 21600
+          tz.transition 1917, 5, :o2, 58112507, 24
+          tz.transition 1917, 10, :o1, 58116203, 24
+          tz.transition 1918, 4, :o2, 58120787, 24
+          tz.transition 1918, 10, :o1, 58124963, 24
+          tz.transition 1919, 4, :o2, 58129307, 24
+          tz.transition 1919, 10, :o1, 58133723, 24
+          tz.transition 1924, 4, :o2, 58173419, 24
+          tz.transition 1924, 10, :o1, 58177523, 24
+          tz.transition 1926, 4, :o2, 58190963, 24
+          tz.transition 1926, 10, :o1, 58194995, 24
+          tz.transition 1927, 4, :o2, 58199531, 24
+          tz.transition 1927, 10, :o1, 58203731, 24
+          tz.transition 1928, 4, :o2, 58208435, 24
+          tz.transition 1928, 10, :o1, 58212635, 24
+          tz.transition 1929, 4, :o2, 58217339, 24
+          tz.transition 1929, 10, :o1, 58221371, 24
+          tz.transition 1937, 5, :o2, 58288235, 24
+          tz.transition 1937, 10, :o1, 58291427, 24
+          tz.transition 1938, 3, :o2, 58295531, 24
+          tz.transition 1938, 10, :o1, 58300163, 24
+          tz.transition 1939, 4, :o2, 58304867, 24
+          tz.transition 1939, 10, :o1, 58309067, 24
+          tz.transition 1940, 3, :o2, 58312931, 24
+          tz.transition 1942, 5, :o3, 29165789, 12
+          tz.transition 1942, 9, :o2, 29167253, 12
+          tz.transition 1943, 4, :o3, 29169989, 12
+          tz.transition 1943, 10, :o2, 29172017, 12
+          tz.transition 1944, 4, :o3, 29174357, 12
+          tz.transition 1944, 10, :o2, 29176493, 12
+          tz.transition 1945, 4, :o3, 29178725, 12
+          tz.transition 1945, 9, :o2, 58361483, 24
+          tz.transition 1946, 4, :o3, 29183093, 12
+          tz.transition 1946, 9, :o4, 29185121, 12
+          tz.transition 1949, 4, :o5, 29196449, 12
+          tz.transition 1949, 9, :o4, 58396547, 24
+          tz.transition 1974, 4, :o5, 135122400
+          tz.transition 1974, 10, :o4, 150246000
+          tz.transition 1975, 4, :o5, 167176800
+          tz.transition 1975, 10, :o4, 181695600
+          tz.transition 1976, 3, :o5, 196812000
+          tz.transition 1976, 9, :o4, 212540400
+          tz.transition 1977, 4, :o5, 228866400
+          tz.transition 1977, 9, :o4, 243990000
+          tz.transition 1978, 4, :o5, 260402400
+          tz.transition 1978, 9, :o4, 276044400
+          tz.transition 1979, 4, :o5, 291776400
+          tz.transition 1979, 9, :o4, 307501200
+          tz.transition 1980, 4, :o5, 323830800
+          tz.transition 1980, 9, :o4, 338950800
+          tz.transition 1981, 3, :o5, 354675600
+          tz.transition 1981, 9, :o4, 370400400
+          tz.transition 1982, 3, :o5, 386125200
+          tz.transition 1982, 9, :o4, 401850000
+          tz.transition 1983, 3, :o5, 417574800
+          tz.transition 1983, 9, :o4, 433299600
+          tz.transition 1984, 3, :o5, 449024400
+          tz.transition 1984, 9, :o4, 465354000
+          tz.transition 1985, 3, :o5, 481078800
+          tz.transition 1985, 9, :o4, 496803600
+          tz.transition 1986, 3, :o5, 512528400
+          tz.transition 1986, 9, :o4, 528253200
+          tz.transition 1987, 3, :o5, 543978000
+          tz.transition 1987, 9, :o4, 559702800
+          tz.transition 1988, 3, :o5, 575427600
+          tz.transition 1988, 9, :o4, 591152400
+          tz.transition 1989, 3, :o5, 606877200
+          tz.transition 1989, 9, :o4, 622602000
+          tz.transition 1990, 3, :o5, 638326800
+          tz.transition 1990, 9, :o4, 654656400
+          tz.transition 1991, 3, :o5, 670381200
+          tz.transition 1991, 9, :o4, 686106000
+          tz.transition 1992, 3, :o5, 701830800
+          tz.transition 1992, 9, :o4, 717555600
+          tz.transition 1993, 3, :o5, 733280400
+          tz.transition 1993, 9, :o4, 749005200
+          tz.transition 1994, 3, :o5, 764730000
+          tz.transition 1994, 9, :o4, 780454800
+          tz.transition 1995, 3, :o5, 796179600
+          tz.transition 1995, 9, :o4, 811904400
+          tz.transition 1996, 3, :o5, 828234000
+          tz.transition 1996, 10, :o4, 846378000
+          tz.transition 1997, 3, :o5, 859683600
+          tz.transition 1997, 10, :o4, 877827600
+          tz.transition 1998, 3, :o5, 891133200
+          tz.transition 1998, 10, :o4, 909277200
+          tz.transition 1999, 3, :o5, 922582800
+          tz.transition 1999, 10, :o4, 941331600
+          tz.transition 2000, 3, :o5, 954032400
+          tz.transition 2000, 10, :o4, 972781200
+          tz.transition 2001, 3, :o5, 985482000
+          tz.transition 2001, 10, :o4, 1004230800
+          tz.transition 2002, 3, :o5, 1017536400
+          tz.transition 2002, 10, :o4, 1035680400
+          tz.transition 2003, 3, :o5, 1048986000
+          tz.transition 2003, 10, :o4, 1067130000
+          tz.transition 2004, 3, :o5, 1080435600
+          tz.transition 2004, 10, :o4, 1099184400
+          tz.transition 2005, 3, :o5, 1111885200
+          tz.transition 2005, 10, :o4, 1130634000
+          tz.transition 2006, 3, :o5, 1143334800
+          tz.transition 2006, 10, :o4, 1162083600
+          tz.transition 2007, 3, :o5, 1174784400
+          tz.transition 2007, 10, :o4, 1193533200
+          tz.transition 2008, 3, :o5, 1206838800
+          tz.transition 2008, 10, :o4, 1224982800
+          tz.transition 2009, 3, :o5, 1238288400
+          tz.transition 2009, 10, :o4, 1256432400
+          tz.transition 2010, 3, :o5, 1269738000
+          tz.transition 2010, 10, :o4, 1288486800
+          tz.transition 2011, 3, :o5, 1301187600
+          tz.transition 2011, 10, :o4, 1319936400
+          tz.transition 2012, 3, :o5, 1332637200
+          tz.transition 2012, 10, :o4, 1351386000
+          tz.transition 2013, 3, :o5, 1364691600
+          tz.transition 2013, 10, :o4, 1382835600
+          tz.transition 2014, 3, :o5, 1396141200
+          tz.transition 2014, 10, :o4, 1414285200
+          tz.transition 2015, 3, :o5, 1427590800
+          tz.transition 2015, 10, :o4, 1445734800
+          tz.transition 2016, 3, :o5, 1459040400
+          tz.transition 2016, 10, :o4, 1477789200
+          tz.transition 2017, 3, :o5, 1490490000
+          tz.transition 2017, 10, :o4, 1509238800
+          tz.transition 2018, 3, :o5, 1521939600
+          tz.transition 2018, 10, :o4, 1540688400
+          tz.transition 2019, 3, :o5, 1553994000
+          tz.transition 2019, 10, :o4, 1572138000
+          tz.transition 2020, 3, :o5, 1585443600
+          tz.transition 2020, 10, :o4, 1603587600
+          tz.transition 2021, 3, :o5, 1616893200
+          tz.transition 2021, 10, :o4, 1635642000
+          tz.transition 2022, 3, :o5, 1648342800
+          tz.transition 2022, 10, :o4, 1667091600
+          tz.transition 2023, 3, :o5, 1679792400
+          tz.transition 2023, 10, :o4, 1698541200
+          tz.transition 2024, 3, :o5, 1711846800
+          tz.transition 2024, 10, :o4, 1729990800
+          tz.transition 2025, 3, :o5, 1743296400
+          tz.transition 2025, 10, :o4, 1761440400
+          tz.transition 2026, 3, :o5, 1774746000
+          tz.transition 2026, 10, :o4, 1792890000
+          tz.transition 2027, 3, :o5, 1806195600
+          tz.transition 2027, 10, :o4, 1824944400
+          tz.transition 2028, 3, :o5, 1837645200
+          tz.transition 2028, 10, :o4, 1856394000
+          tz.transition 2029, 3, :o5, 1869094800
+          tz.transition 2029, 10, :o4, 1887843600
+          tz.transition 2030, 3, :o5, 1901149200
+          tz.transition 2030, 10, :o4, 1919293200
+          tz.transition 2031, 3, :o5, 1932598800
+          tz.transition 2031, 10, :o4, 1950742800
+          tz.transition 2032, 3, :o5, 1964048400
+          tz.transition 2032, 10, :o4, 1982797200
+          tz.transition 2033, 3, :o5, 1995498000
+          tz.transition 2033, 10, :o4, 2014246800
+          tz.transition 2034, 3, :o5, 2026947600
+          tz.transition 2034, 10, :o4, 2045696400
+          tz.transition 2035, 3, :o5, 2058397200
+          tz.transition 2035, 10, :o4, 2077146000
+          tz.transition 2036, 3, :o5, 2090451600
+          tz.transition 2036, 10, :o4, 2108595600
+          tz.transition 2037, 3, :o5, 2121901200
+          tz.transition 2037, 10, :o4, 2140045200
+          tz.transition 2038, 3, :o5, 59172253, 24
+          tz.transition 2038, 10, :o4, 59177461, 24
+          tz.transition 2039, 3, :o5, 59180989, 24
+          tz.transition 2039, 10, :o4, 59186197, 24
+          tz.transition 2040, 3, :o5, 59189725, 24
+          tz.transition 2040, 10, :o4, 59194933, 24
+          tz.transition 2041, 3, :o5, 59198629, 24
+          tz.transition 2041, 10, :o4, 59203669, 24
+          tz.transition 2042, 3, :o5, 59207365, 24
+          tz.transition 2042, 10, :o4, 59212405, 24
+          tz.transition 2043, 3, :o5, 59216101, 24
+          tz.transition 2043, 10, :o4, 59221141, 24
+          tz.transition 2044, 3, :o5, 59224837, 24
+          tz.transition 2044, 10, :o4, 59230045, 24
+          tz.transition 2045, 3, :o5, 59233573, 24
+          tz.transition 2045, 10, :o4, 59238781, 24
+          tz.transition 2046, 3, :o5, 59242309, 24
+          tz.transition 2046, 10, :o4, 59247517, 24
+          tz.transition 2047, 3, :o5, 59251213, 24
+          tz.transition 2047, 10, :o4, 59256253, 24
+          tz.transition 2048, 3, :o5, 59259949, 24
+          tz.transition 2048, 10, :o4, 59264989, 24
+          tz.transition 2049, 3, :o5, 59268685, 24
+          tz.transition 2049, 10, :o4, 59273893, 24
+          tz.transition 2050, 3, :o5, 59277421, 24
+          tz.transition 2050, 10, :o4, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Minsk.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Minsk.rb
new file mode 100644
index 00000000..fa15816c
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Minsk.rb
@@ -0,0 +1,170 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Minsk
+        include TimezoneDefinition
+        
+        timezone 'Europe/Minsk' do |tz|
+          tz.offset :o0, 6616, 0, :LMT
+          tz.offset :o1, 6600, 0, :MMT
+          tz.offset :o2, 7200, 0, :EET
+          tz.offset :o3, 10800, 0, :MSK
+          tz.offset :o4, 3600, 3600, :CEST
+          tz.offset :o5, 3600, 0, :CET
+          tz.offset :o6, 10800, 3600, :MSD
+          tz.offset :o7, 7200, 3600, :EEST
+          
+          tz.transition 1879, 12, :o1, 26003326573, 10800
+          tz.transition 1924, 5, :o2, 349042669, 144
+          tz.transition 1930, 6, :o3, 29113781, 12
+          tz.transition 1941, 6, :o4, 19441387, 8
+          tz.transition 1942, 11, :o5, 58335973, 24
+          tz.transition 1943, 3, :o4, 58339501, 24
+          tz.transition 1943, 10, :o5, 58344037, 24
+          tz.transition 1944, 4, :o4, 58348405, 24
+          tz.transition 1944, 7, :o3, 29175293, 12
+          tz.transition 1981, 3, :o6, 354920400
+          tz.transition 1981, 9, :o3, 370728000
+          tz.transition 1982, 3, :o6, 386456400
+          tz.transition 1982, 9, :o3, 402264000
+          tz.transition 1983, 3, :o6, 417992400
+          tz.transition 1983, 9, :o3, 433800000
+          tz.transition 1984, 3, :o6, 449614800
+          tz.transition 1984, 9, :o3, 465346800
+          tz.transition 1985, 3, :o6, 481071600
+          tz.transition 1985, 9, :o3, 496796400
+          tz.transition 1986, 3, :o6, 512521200
+          tz.transition 1986, 9, :o3, 528246000
+          tz.transition 1987, 3, :o6, 543970800
+          tz.transition 1987, 9, :o3, 559695600
+          tz.transition 1988, 3, :o6, 575420400
+          tz.transition 1988, 9, :o3, 591145200
+          tz.transition 1989, 3, :o6, 606870000
+          tz.transition 1989, 9, :o3, 622594800
+          tz.transition 1991, 3, :o7, 670374000
+          tz.transition 1991, 9, :o2, 686102400
+          tz.transition 1992, 3, :o7, 701820000
+          tz.transition 1992, 9, :o2, 717544800
+          tz.transition 1993, 3, :o7, 733276800
+          tz.transition 1993, 9, :o2, 749001600
+          tz.transition 1994, 3, :o7, 764726400
+          tz.transition 1994, 9, :o2, 780451200
+          tz.transition 1995, 3, :o7, 796176000
+          tz.transition 1995, 9, :o2, 811900800
+          tz.transition 1996, 3, :o7, 828230400
+          tz.transition 1996, 10, :o2, 846374400
+          tz.transition 1997, 3, :o7, 859680000
+          tz.transition 1997, 10, :o2, 877824000
+          tz.transition 1998, 3, :o7, 891129600
+          tz.transition 1998, 10, :o2, 909273600
+          tz.transition 1999, 3, :o7, 922579200
+          tz.transition 1999, 10, :o2, 941328000
+          tz.transition 2000, 3, :o7, 954028800
+          tz.transition 2000, 10, :o2, 972777600
+          tz.transition 2001, 3, :o7, 985478400
+          tz.transition 2001, 10, :o2, 1004227200
+          tz.transition 2002, 3, :o7, 1017532800
+          tz.transition 2002, 10, :o2, 1035676800
+          tz.transition 2003, 3, :o7, 1048982400
+          tz.transition 2003, 10, :o2, 1067126400
+          tz.transition 2004, 3, :o7, 1080432000
+          tz.transition 2004, 10, :o2, 1099180800
+          tz.transition 2005, 3, :o7, 1111881600
+          tz.transition 2005, 10, :o2, 1130630400
+          tz.transition 2006, 3, :o7, 1143331200
+          tz.transition 2006, 10, :o2, 1162080000
+          tz.transition 2007, 3, :o7, 1174780800
+          tz.transition 2007, 10, :o2, 1193529600
+          tz.transition 2008, 3, :o7, 1206835200
+          tz.transition 2008, 10, :o2, 1224979200
+          tz.transition 2009, 3, :o7, 1238284800
+          tz.transition 2009, 10, :o2, 1256428800
+          tz.transition 2010, 3, :o7, 1269734400
+          tz.transition 2010, 10, :o2, 1288483200
+          tz.transition 2011, 3, :o7, 1301184000
+          tz.transition 2011, 10, :o2, 1319932800
+          tz.transition 2012, 3, :o7, 1332633600
+          tz.transition 2012, 10, :o2, 1351382400
+          tz.transition 2013, 3, :o7, 1364688000
+          tz.transition 2013, 10, :o2, 1382832000
+          tz.transition 2014, 3, :o7, 1396137600
+          tz.transition 2014, 10, :o2, 1414281600
+          tz.transition 2015, 3, :o7, 1427587200
+          tz.transition 2015, 10, :o2, 1445731200
+          tz.transition 2016, 3, :o7, 1459036800
+          tz.transition 2016, 10, :o2, 1477785600
+          tz.transition 2017, 3, :o7, 1490486400
+          tz.transition 2017, 10, :o2, 1509235200
+          tz.transition 2018, 3, :o7, 1521936000
+          tz.transition 2018, 10, :o2, 1540684800
+          tz.transition 2019, 3, :o7, 1553990400
+          tz.transition 2019, 10, :o2, 1572134400
+          tz.transition 2020, 3, :o7, 1585440000
+          tz.transition 2020, 10, :o2, 1603584000
+          tz.transition 2021, 3, :o7, 1616889600
+          tz.transition 2021, 10, :o2, 1635638400
+          tz.transition 2022, 3, :o7, 1648339200
+          tz.transition 2022, 10, :o2, 1667088000
+          tz.transition 2023, 3, :o7, 1679788800
+          tz.transition 2023, 10, :o2, 1698537600
+          tz.transition 2024, 3, :o7, 1711843200
+          tz.transition 2024, 10, :o2, 1729987200
+          tz.transition 2025, 3, :o7, 1743292800
+          tz.transition 2025, 10, :o2, 1761436800
+          tz.transition 2026, 3, :o7, 1774742400
+          tz.transition 2026, 10, :o2, 1792886400
+          tz.transition 2027, 3, :o7, 1806192000
+          tz.transition 2027, 10, :o2, 1824940800
+          tz.transition 2028, 3, :o7, 1837641600
+          tz.transition 2028, 10, :o2, 1856390400
+          tz.transition 2029, 3, :o7, 1869091200
+          tz.transition 2029, 10, :o2, 1887840000
+          tz.transition 2030, 3, :o7, 1901145600
+          tz.transition 2030, 10, :o2, 1919289600
+          tz.transition 2031, 3, :o7, 1932595200
+          tz.transition 2031, 10, :o2, 1950739200
+          tz.transition 2032, 3, :o7, 1964044800
+          tz.transition 2032, 10, :o2, 1982793600
+          tz.transition 2033, 3, :o7, 1995494400
+          tz.transition 2033, 10, :o2, 2014243200
+          tz.transition 2034, 3, :o7, 2026944000
+          tz.transition 2034, 10, :o2, 2045692800
+          tz.transition 2035, 3, :o7, 2058393600
+          tz.transition 2035, 10, :o2, 2077142400
+          tz.transition 2036, 3, :o7, 2090448000
+          tz.transition 2036, 10, :o2, 2108592000
+          tz.transition 2037, 3, :o7, 2121897600
+          tz.transition 2037, 10, :o2, 2140041600
+          tz.transition 2038, 3, :o7, 4931021, 2
+          tz.transition 2038, 10, :o2, 4931455, 2
+          tz.transition 2039, 3, :o7, 4931749, 2
+          tz.transition 2039, 10, :o2, 4932183, 2
+          tz.transition 2040, 3, :o7, 4932477, 2
+          tz.transition 2040, 10, :o2, 4932911, 2
+          tz.transition 2041, 3, :o7, 4933219, 2
+          tz.transition 2041, 10, :o2, 4933639, 2
+          tz.transition 2042, 3, :o7, 4933947, 2
+          tz.transition 2042, 10, :o2, 4934367, 2
+          tz.transition 2043, 3, :o7, 4934675, 2
+          tz.transition 2043, 10, :o2, 4935095, 2
+          tz.transition 2044, 3, :o7, 4935403, 2
+          tz.transition 2044, 10, :o2, 4935837, 2
+          tz.transition 2045, 3, :o7, 4936131, 2
+          tz.transition 2045, 10, :o2, 4936565, 2
+          tz.transition 2046, 3, :o7, 4936859, 2
+          tz.transition 2046, 10, :o2, 4937293, 2
+          tz.transition 2047, 3, :o7, 4937601, 2
+          tz.transition 2047, 10, :o2, 4938021, 2
+          tz.transition 2048, 3, :o7, 4938329, 2
+          tz.transition 2048, 10, :o2, 4938749, 2
+          tz.transition 2049, 3, :o7, 4939057, 2
+          tz.transition 2049, 10, :o2, 4939491, 2
+          tz.transition 2050, 3, :o7, 4939785, 2
+          tz.transition 2050, 10, :o2, 4940219, 2
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Moscow.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Moscow.rb
new file mode 100644
index 00000000..ef269b67
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Moscow.rb
@@ -0,0 +1,181 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Moscow
+        include TimezoneDefinition
+        
+        timezone 'Europe/Moscow' do |tz|
+          tz.offset :o0, 9020, 0, :LMT
+          tz.offset :o1, 9000, 0, :MMT
+          tz.offset :o2, 9048, 0, :MMT
+          tz.offset :o3, 9048, 3600, :MST
+          tz.offset :o4, 9048, 7200, :MDST
+          tz.offset :o5, 10800, 3600, :MSD
+          tz.offset :o6, 10800, 0, :MSK
+          tz.offset :o7, 10800, 7200, :MSD
+          tz.offset :o8, 7200, 0, :EET
+          tz.offset :o9, 7200, 3600, :EEST
+          
+          tz.transition 1879, 12, :o1, 10401330509, 4320
+          tz.transition 1916, 7, :o2, 116210275, 48
+          tz.transition 1917, 7, :o3, 8717080873, 3600
+          tz.transition 1917, 12, :o2, 8717725273, 3600
+          tz.transition 1918, 5, :o4, 8718283123, 3600
+          tz.transition 1918, 9, :o3, 8718668473, 3600
+          tz.transition 1919, 5, :o4, 8719597123, 3600
+          tz.transition 1919, 6, :o5, 8719705423, 3600
+          tz.transition 1919, 8, :o6, 7266559, 3
+          tz.transition 1921, 2, :o5, 7268206, 3
+          tz.transition 1921, 3, :o7, 58146463, 24
+          tz.transition 1921, 8, :o5, 58150399, 24
+          tz.transition 1921, 9, :o6, 7268890, 3
+          tz.transition 1922, 9, :o8, 19386627, 8
+          tz.transition 1930, 6, :o6, 29113781, 12
+          tz.transition 1981, 3, :o5, 354920400
+          tz.transition 1981, 9, :o6, 370728000
+          tz.transition 1982, 3, :o5, 386456400
+          tz.transition 1982, 9, :o6, 402264000
+          tz.transition 1983, 3, :o5, 417992400
+          tz.transition 1983, 9, :o6, 433800000
+          tz.transition 1984, 3, :o5, 449614800
+          tz.transition 1984, 9, :o6, 465346800
+          tz.transition 1985, 3, :o5, 481071600
+          tz.transition 1985, 9, :o6, 496796400
+          tz.transition 1986, 3, :o5, 512521200
+          tz.transition 1986, 9, :o6, 528246000
+          tz.transition 1987, 3, :o5, 543970800
+          tz.transition 1987, 9, :o6, 559695600
+          tz.transition 1988, 3, :o5, 575420400
+          tz.transition 1988, 9, :o6, 591145200
+          tz.transition 1989, 3, :o5, 606870000
+          tz.transition 1989, 9, :o6, 622594800
+          tz.transition 1990, 3, :o5, 638319600
+          tz.transition 1990, 9, :o6, 654649200
+          tz.transition 1991, 3, :o9, 670374000
+          tz.transition 1991, 9, :o8, 686102400
+          tz.transition 1992, 1, :o6, 695779200
+          tz.transition 1992, 3, :o5, 701812800
+          tz.transition 1992, 9, :o6, 717534000
+          tz.transition 1993, 3, :o5, 733273200
+          tz.transition 1993, 9, :o6, 748998000
+          tz.transition 1994, 3, :o5, 764722800
+          tz.transition 1994, 9, :o6, 780447600
+          tz.transition 1995, 3, :o5, 796172400
+          tz.transition 1995, 9, :o6, 811897200
+          tz.transition 1996, 3, :o5, 828226800
+          tz.transition 1996, 10, :o6, 846370800
+          tz.transition 1997, 3, :o5, 859676400
+          tz.transition 1997, 10, :o6, 877820400
+          tz.transition 1998, 3, :o5, 891126000
+          tz.transition 1998, 10, :o6, 909270000
+          tz.transition 1999, 3, :o5, 922575600
+          tz.transition 1999, 10, :o6, 941324400
+          tz.transition 2000, 3, :o5, 954025200
+          tz.transition 2000, 10, :o6, 972774000
+          tz.transition 2001, 3, :o5, 985474800
+          tz.transition 2001, 10, :o6, 1004223600
+          tz.transition 2002, 3, :o5, 1017529200
+          tz.transition 2002, 10, :o6, 1035673200
+          tz.transition 2003, 3, :o5, 1048978800
+          tz.transition 2003, 10, :o6, 1067122800
+          tz.transition 2004, 3, :o5, 1080428400
+          tz.transition 2004, 10, :o6, 1099177200
+          tz.transition 2005, 3, :o5, 1111878000
+          tz.transition 2005, 10, :o6, 1130626800
+          tz.transition 2006, 3, :o5, 1143327600
+          tz.transition 2006, 10, :o6, 1162076400
+          tz.transition 2007, 3, :o5, 1174777200
+          tz.transition 2007, 10, :o6, 1193526000
+          tz.transition 2008, 3, :o5, 1206831600
+          tz.transition 2008, 10, :o6, 1224975600
+          tz.transition 2009, 3, :o5, 1238281200
+          tz.transition 2009, 10, :o6, 1256425200
+          tz.transition 2010, 3, :o5, 1269730800
+          tz.transition 2010, 10, :o6, 1288479600
+          tz.transition 2011, 3, :o5, 1301180400
+          tz.transition 2011, 10, :o6, 1319929200
+          tz.transition 2012, 3, :o5, 1332630000
+          tz.transition 2012, 10, :o6, 1351378800
+          tz.transition 2013, 3, :o5, 1364684400
+          tz.transition 2013, 10, :o6, 1382828400
+          tz.transition 2014, 3, :o5, 1396134000
+          tz.transition 2014, 10, :o6, 1414278000
+          tz.transition 2015, 3, :o5, 1427583600
+          tz.transition 2015, 10, :o6, 1445727600
+          tz.transition 2016, 3, :o5, 1459033200
+          tz.transition 2016, 10, :o6, 1477782000
+          tz.transition 2017, 3, :o5, 1490482800
+          tz.transition 2017, 10, :o6, 1509231600
+          tz.transition 2018, 3, :o5, 1521932400
+          tz.transition 2018, 10, :o6, 1540681200
+          tz.transition 2019, 3, :o5, 1553986800
+          tz.transition 2019, 10, :o6, 1572130800
+          tz.transition 2020, 3, :o5, 1585436400
+          tz.transition 2020, 10, :o6, 1603580400
+          tz.transition 2021, 3, :o5, 1616886000
+          tz.transition 2021, 10, :o6, 1635634800
+          tz.transition 2022, 3, :o5, 1648335600
+          tz.transition 2022, 10, :o6, 1667084400
+          tz.transition 2023, 3, :o5, 1679785200
+          tz.transition 2023, 10, :o6, 1698534000
+          tz.transition 2024, 3, :o5, 1711839600
+          tz.transition 2024, 10, :o6, 1729983600
+          tz.transition 2025, 3, :o5, 1743289200
+          tz.transition 2025, 10, :o6, 1761433200
+          tz.transition 2026, 3, :o5, 1774738800
+          tz.transition 2026, 10, :o6, 1792882800
+          tz.transition 2027, 3, :o5, 1806188400
+          tz.transition 2027, 10, :o6, 1824937200
+          tz.transition 2028, 3, :o5, 1837638000
+          tz.transition 2028, 10, :o6, 1856386800
+          tz.transition 2029, 3, :o5, 1869087600
+          tz.transition 2029, 10, :o6, 1887836400
+          tz.transition 2030, 3, :o5, 1901142000
+          tz.transition 2030, 10, :o6, 1919286000
+          tz.transition 2031, 3, :o5, 1932591600
+          tz.transition 2031, 10, :o6, 1950735600
+          tz.transition 2032, 3, :o5, 1964041200
+          tz.transition 2032, 10, :o6, 1982790000
+          tz.transition 2033, 3, :o5, 1995490800
+          tz.transition 2033, 10, :o6, 2014239600
+          tz.transition 2034, 3, :o5, 2026940400
+          tz.transition 2034, 10, :o6, 2045689200
+          tz.transition 2035, 3, :o5, 2058390000
+          tz.transition 2035, 10, :o6, 2077138800
+          tz.transition 2036, 3, :o5, 2090444400
+          tz.transition 2036, 10, :o6, 2108588400
+          tz.transition 2037, 3, :o5, 2121894000
+          tz.transition 2037, 10, :o6, 2140038000
+          tz.transition 2038, 3, :o5, 59172251, 24
+          tz.transition 2038, 10, :o6, 59177459, 24
+          tz.transition 2039, 3, :o5, 59180987, 24
+          tz.transition 2039, 10, :o6, 59186195, 24
+          tz.transition 2040, 3, :o5, 59189723, 24
+          tz.transition 2040, 10, :o6, 59194931, 24
+          tz.transition 2041, 3, :o5, 59198627, 24
+          tz.transition 2041, 10, :o6, 59203667, 24
+          tz.transition 2042, 3, :o5, 59207363, 24
+          tz.transition 2042, 10, :o6, 59212403, 24
+          tz.transition 2043, 3, :o5, 59216099, 24
+          tz.transition 2043, 10, :o6, 59221139, 24
+          tz.transition 2044, 3, :o5, 59224835, 24
+          tz.transition 2044, 10, :o6, 59230043, 24
+          tz.transition 2045, 3, :o5, 59233571, 24
+          tz.transition 2045, 10, :o6, 59238779, 24
+          tz.transition 2046, 3, :o5, 59242307, 24
+          tz.transition 2046, 10, :o6, 59247515, 24
+          tz.transition 2047, 3, :o5, 59251211, 24
+          tz.transition 2047, 10, :o6, 59256251, 24
+          tz.transition 2048, 3, :o5, 59259947, 24
+          tz.transition 2048, 10, :o6, 59264987, 24
+          tz.transition 2049, 3, :o5, 59268683, 24
+          tz.transition 2049, 10, :o6, 59273891, 24
+          tz.transition 2050, 3, :o5, 59277419, 24
+          tz.transition 2050, 10, :o6, 59282627, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Paris.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Paris.rb
new file mode 100644
index 00000000..e3236c0b
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Paris.rb
@@ -0,0 +1,232 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Paris
+        include TimezoneDefinition
+        
+        timezone 'Europe/Paris' do |tz|
+          tz.offset :o0, 561, 0, :LMT
+          tz.offset :o1, 561, 0, :PMT
+          tz.offset :o2, 0, 0, :WET
+          tz.offset :o3, 0, 3600, :WEST
+          tz.offset :o4, 3600, 3600, :CEST
+          tz.offset :o5, 3600, 0, :CET
+          tz.offset :o6, 0, 7200, :WEMT
+          
+          tz.transition 1891, 3, :o1, 69460027033, 28800
+          tz.transition 1911, 3, :o2, 69670267033, 28800
+          tz.transition 1916, 6, :o3, 58104707, 24
+          tz.transition 1916, 10, :o2, 58107323, 24
+          tz.transition 1917, 3, :o3, 58111499, 24
+          tz.transition 1917, 10, :o2, 58116227, 24
+          tz.transition 1918, 3, :o3, 58119899, 24
+          tz.transition 1918, 10, :o2, 58124963, 24
+          tz.transition 1919, 3, :o3, 58128467, 24
+          tz.transition 1919, 10, :o2, 58133699, 24
+          tz.transition 1920, 2, :o3, 58136867, 24
+          tz.transition 1920, 10, :o2, 58142915, 24
+          tz.transition 1921, 3, :o3, 58146323, 24
+          tz.transition 1921, 10, :o2, 58151723, 24
+          tz.transition 1922, 3, :o3, 58155347, 24
+          tz.transition 1922, 10, :o2, 58160051, 24
+          tz.transition 1923, 5, :o3, 58165595, 24
+          tz.transition 1923, 10, :o2, 58168787, 24
+          tz.transition 1924, 3, :o3, 58172987, 24
+          tz.transition 1924, 10, :o2, 58177523, 24
+          tz.transition 1925, 4, :o3, 58181891, 24
+          tz.transition 1925, 10, :o2, 58186259, 24
+          tz.transition 1926, 4, :o3, 58190963, 24
+          tz.transition 1926, 10, :o2, 58194995, 24
+          tz.transition 1927, 4, :o3, 58199531, 24
+          tz.transition 1927, 10, :o2, 58203731, 24
+          tz.transition 1928, 4, :o3, 58208435, 24
+          tz.transition 1928, 10, :o2, 58212635, 24
+          tz.transition 1929, 4, :o3, 58217339, 24
+          tz.transition 1929, 10, :o2, 58221371, 24
+          tz.transition 1930, 4, :o3, 58225907, 24
+          tz.transition 1930, 10, :o2, 58230107, 24
+          tz.transition 1931, 4, :o3, 58234811, 24
+          tz.transition 1931, 10, :o2, 58238843, 24
+          tz.transition 1932, 4, :o3, 58243211, 24
+          tz.transition 1932, 10, :o2, 58247579, 24
+          tz.transition 1933, 3, :o3, 58251779, 24
+          tz.transition 1933, 10, :o2, 58256483, 24
+          tz.transition 1934, 4, :o3, 58260851, 24
+          tz.transition 1934, 10, :o2, 58265219, 24
+          tz.transition 1935, 3, :o3, 58269419, 24
+          tz.transition 1935, 10, :o2, 58273955, 24
+          tz.transition 1936, 4, :o3, 58278659, 24
+          tz.transition 1936, 10, :o2, 58282691, 24
+          tz.transition 1937, 4, :o3, 58287059, 24
+          tz.transition 1937, 10, :o2, 58291427, 24
+          tz.transition 1938, 3, :o3, 58295627, 24
+          tz.transition 1938, 10, :o2, 58300163, 24
+          tz.transition 1939, 4, :o3, 58304867, 24
+          tz.transition 1939, 11, :o2, 58310075, 24
+          tz.transition 1940, 2, :o3, 29156215, 12
+          tz.transition 1940, 6, :o4, 29157545, 12
+          tz.transition 1942, 11, :o5, 58335973, 24
+          tz.transition 1943, 3, :o4, 58339501, 24
+          tz.transition 1943, 10, :o5, 58344037, 24
+          tz.transition 1944, 4, :o4, 58348405, 24
+          tz.transition 1944, 8, :o6, 29175929, 12
+          tz.transition 1944, 10, :o3, 58352915, 24
+          tz.transition 1945, 4, :o6, 58357141, 24
+          tz.transition 1945, 9, :o5, 58361149, 24
+          tz.transition 1976, 3, :o4, 196819200
+          tz.transition 1976, 9, :o5, 212540400
+          tz.transition 1977, 4, :o4, 228877200
+          tz.transition 1977, 9, :o5, 243997200
+          tz.transition 1978, 4, :o4, 260326800
+          tz.transition 1978, 10, :o5, 276051600
+          tz.transition 1979, 4, :o4, 291776400
+          tz.transition 1979, 9, :o5, 307501200
+          tz.transition 1980, 4, :o4, 323830800
+          tz.transition 1980, 9, :o5, 338950800
+          tz.transition 1981, 3, :o4, 354675600
+          tz.transition 1981, 9, :o5, 370400400
+          tz.transition 1982, 3, :o4, 386125200
+          tz.transition 1982, 9, :o5, 401850000
+          tz.transition 1983, 3, :o4, 417574800
+          tz.transition 1983, 9, :o5, 433299600
+          tz.transition 1984, 3, :o4, 449024400
+          tz.transition 1984, 9, :o5, 465354000
+          tz.transition 1985, 3, :o4, 481078800
+          tz.transition 1985, 9, :o5, 496803600
+          tz.transition 1986, 3, :o4, 512528400
+          tz.transition 1986, 9, :o5, 528253200
+          tz.transition 1987, 3, :o4, 543978000
+          tz.transition 1987, 9, :o5, 559702800
+          tz.transition 1988, 3, :o4, 575427600
+          tz.transition 1988, 9, :o5, 591152400
+          tz.transition 1989, 3, :o4, 606877200
+          tz.transition 1989, 9, :o5, 622602000
+          tz.transition 1990, 3, :o4, 638326800
+          tz.transition 1990, 9, :o5, 654656400
+          tz.transition 1991, 3, :o4, 670381200
+          tz.transition 1991, 9, :o5, 686106000
+          tz.transition 1992, 3, :o4, 701830800
+          tz.transition 1992, 9, :o5, 717555600
+          tz.transition 1993, 3, :o4, 733280400
+          tz.transition 1993, 9, :o5, 749005200
+          tz.transition 1994, 3, :o4, 764730000
+          tz.transition 1994, 9, :o5, 780454800
+          tz.transition 1995, 3, :o4, 796179600
+          tz.transition 1995, 9, :o5, 811904400
+          tz.transition 1996, 3, :o4, 828234000
+          tz.transition 1996, 10, :o5, 846378000
+          tz.transition 1997, 3, :o4, 859683600
+          tz.transition 1997, 10, :o5, 877827600
+          tz.transition 1998, 3, :o4, 891133200
+          tz.transition 1998, 10, :o5, 909277200
+          tz.transition 1999, 3, :o4, 922582800
+          tz.transition 1999, 10, :o5, 941331600
+          tz.transition 2000, 3, :o4, 954032400
+          tz.transition 2000, 10, :o5, 972781200
+          tz.transition 2001, 3, :o4, 985482000
+          tz.transition 2001, 10, :o5, 1004230800
+          tz.transition 2002, 3, :o4, 1017536400
+          tz.transition 2002, 10, :o5, 1035680400
+          tz.transition 2003, 3, :o4, 1048986000
+          tz.transition 2003, 10, :o5, 1067130000
+          tz.transition 2004, 3, :o4, 1080435600
+          tz.transition 2004, 10, :o5, 1099184400
+          tz.transition 2005, 3, :o4, 1111885200
+          tz.transition 2005, 10, :o5, 1130634000
+          tz.transition 2006, 3, :o4, 1143334800
+          tz.transition 2006, 10, :o5, 1162083600
+          tz.transition 2007, 3, :o4, 1174784400
+          tz.transition 2007, 10, :o5, 1193533200
+          tz.transition 2008, 3, :o4, 1206838800
+          tz.transition 2008, 10, :o5, 1224982800
+          tz.transition 2009, 3, :o4, 1238288400
+          tz.transition 2009, 10, :o5, 1256432400
+          tz.transition 2010, 3, :o4, 1269738000
+          tz.transition 2010, 10, :o5, 1288486800
+          tz.transition 2011, 3, :o4, 1301187600
+          tz.transition 2011, 10, :o5, 1319936400
+          tz.transition 2012, 3, :o4, 1332637200
+          tz.transition 2012, 10, :o5, 1351386000
+          tz.transition 2013, 3, :o4, 1364691600
+          tz.transition 2013, 10, :o5, 1382835600
+          tz.transition 2014, 3, :o4, 1396141200
+          tz.transition 2014, 10, :o5, 1414285200
+          tz.transition 2015, 3, :o4, 1427590800
+          tz.transition 2015, 10, :o5, 1445734800
+          tz.transition 2016, 3, :o4, 1459040400
+          tz.transition 2016, 10, :o5, 1477789200
+          tz.transition 2017, 3, :o4, 1490490000
+          tz.transition 2017, 10, :o5, 1509238800
+          tz.transition 2018, 3, :o4, 1521939600
+          tz.transition 2018, 10, :o5, 1540688400
+          tz.transition 2019, 3, :o4, 1553994000
+          tz.transition 2019, 10, :o5, 1572138000
+          tz.transition 2020, 3, :o4, 1585443600
+          tz.transition 2020, 10, :o5, 1603587600
+          tz.transition 2021, 3, :o4, 1616893200
+          tz.transition 2021, 10, :o5, 1635642000
+          tz.transition 2022, 3, :o4, 1648342800
+          tz.transition 2022, 10, :o5, 1667091600
+          tz.transition 2023, 3, :o4, 1679792400
+          tz.transition 2023, 10, :o5, 1698541200
+          tz.transition 2024, 3, :o4, 1711846800
+          tz.transition 2024, 10, :o5, 1729990800
+          tz.transition 2025, 3, :o4, 1743296400
+          tz.transition 2025, 10, :o5, 1761440400
+          tz.transition 2026, 3, :o4, 1774746000
+          tz.transition 2026, 10, :o5, 1792890000
+          tz.transition 2027, 3, :o4, 1806195600
+          tz.transition 2027, 10, :o5, 1824944400
+          tz.transition 2028, 3, :o4, 1837645200
+          tz.transition 2028, 10, :o5, 1856394000
+          tz.transition 2029, 3, :o4, 1869094800
+          tz.transition 2029, 10, :o5, 1887843600
+          tz.transition 2030, 3, :o4, 1901149200
+          tz.transition 2030, 10, :o5, 1919293200
+          tz.transition 2031, 3, :o4, 1932598800
+          tz.transition 2031, 10, :o5, 1950742800
+          tz.transition 2032, 3, :o4, 1964048400
+          tz.transition 2032, 10, :o5, 1982797200
+          tz.transition 2033, 3, :o4, 1995498000
+          tz.transition 2033, 10, :o5, 2014246800
+          tz.transition 2034, 3, :o4, 2026947600
+          tz.transition 2034, 10, :o5, 2045696400
+          tz.transition 2035, 3, :o4, 2058397200
+          tz.transition 2035, 10, :o5, 2077146000
+          tz.transition 2036, 3, :o4, 2090451600
+          tz.transition 2036, 10, :o5, 2108595600
+          tz.transition 2037, 3, :o4, 2121901200
+          tz.transition 2037, 10, :o5, 2140045200
+          tz.transition 2038, 3, :o4, 59172253, 24
+          tz.transition 2038, 10, :o5, 59177461, 24
+          tz.transition 2039, 3, :o4, 59180989, 24
+          tz.transition 2039, 10, :o5, 59186197, 24
+          tz.transition 2040, 3, :o4, 59189725, 24
+          tz.transition 2040, 10, :o5, 59194933, 24
+          tz.transition 2041, 3, :o4, 59198629, 24
+          tz.transition 2041, 10, :o5, 59203669, 24
+          tz.transition 2042, 3, :o4, 59207365, 24
+          tz.transition 2042, 10, :o5, 59212405, 24
+          tz.transition 2043, 3, :o4, 59216101, 24
+          tz.transition 2043, 10, :o5, 59221141, 24
+          tz.transition 2044, 3, :o4, 59224837, 24
+          tz.transition 2044, 10, :o5, 59230045, 24
+          tz.transition 2045, 3, :o4, 59233573, 24
+          tz.transition 2045, 10, :o5, 59238781, 24
+          tz.transition 2046, 3, :o4, 59242309, 24
+          tz.transition 2046, 10, :o5, 59247517, 24
+          tz.transition 2047, 3, :o4, 59251213, 24
+          tz.transition 2047, 10, :o5, 59256253, 24
+          tz.transition 2048, 3, :o4, 59259949, 24
+          tz.transition 2048, 10, :o5, 59264989, 24
+          tz.transition 2049, 3, :o4, 59268685, 24
+          tz.transition 2049, 10, :o5, 59273893, 24
+          tz.transition 2050, 3, :o4, 59277421, 24
+          tz.transition 2050, 10, :o5, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Prague.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Prague.rb
new file mode 100644
index 00000000..bcabee96
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Prague.rb
@@ -0,0 +1,187 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Prague
+        include TimezoneDefinition
+        
+        timezone 'Europe/Prague' do |tz|
+          tz.offset :o0, 3464, 0, :LMT
+          tz.offset :o1, 3464, 0, :PMT
+          tz.offset :o2, 3600, 0, :CET
+          tz.offset :o3, 3600, 3600, :CEST
+          
+          tz.transition 1849, 12, :o1, 25884991367, 10800
+          tz.transition 1891, 9, :o2, 26049669767, 10800
+          tz.transition 1916, 4, :o3, 29051813, 12
+          tz.transition 1916, 9, :o2, 58107299, 24
+          tz.transition 1917, 4, :o3, 58112029, 24
+          tz.transition 1917, 9, :o2, 58115725, 24
+          tz.transition 1918, 4, :o3, 58120765, 24
+          tz.transition 1918, 9, :o2, 58124461, 24
+          tz.transition 1940, 4, :o3, 58313293, 24
+          tz.transition 1942, 11, :o2, 58335973, 24
+          tz.transition 1943, 3, :o3, 58339501, 24
+          tz.transition 1943, 10, :o2, 58344037, 24
+          tz.transition 1944, 4, :o3, 58348405, 24
+          tz.transition 1944, 9, :o2, 58352413, 24
+          tz.transition 1945, 4, :o3, 58357285, 24
+          tz.transition 1945, 11, :o2, 58362661, 24
+          tz.transition 1946, 5, :o3, 58366717, 24
+          tz.transition 1946, 10, :o2, 58370389, 24
+          tz.transition 1947, 4, :o3, 58375093, 24
+          tz.transition 1947, 10, :o2, 58379125, 24
+          tz.transition 1948, 4, :o3, 58383829, 24
+          tz.transition 1948, 10, :o2, 58387861, 24
+          tz.transition 1949, 4, :o3, 58392373, 24
+          tz.transition 1949, 10, :o2, 58396597, 24
+          tz.transition 1979, 4, :o3, 291776400
+          tz.transition 1979, 9, :o2, 307501200
+          tz.transition 1980, 4, :o3, 323830800
+          tz.transition 1980, 9, :o2, 338950800
+          tz.transition 1981, 3, :o3, 354675600
+          tz.transition 1981, 9, :o2, 370400400
+          tz.transition 1982, 3, :o3, 386125200
+          tz.transition 1982, 9, :o2, 401850000
+          tz.transition 1983, 3, :o3, 417574800
+          tz.transition 1983, 9, :o2, 433299600
+          tz.transition 1984, 3, :o3, 449024400
+          tz.transition 1984, 9, :o2, 465354000
+          tz.transition 1985, 3, :o3, 481078800
+          tz.transition 1985, 9, :o2, 496803600
+          tz.transition 1986, 3, :o3, 512528400
+          tz.transition 1986, 9, :o2, 528253200
+          tz.transition 1987, 3, :o3, 543978000
+          tz.transition 1987, 9, :o2, 559702800
+          tz.transition 1988, 3, :o3, 575427600
+          tz.transition 1988, 9, :o2, 591152400
+          tz.transition 1989, 3, :o3, 606877200
+          tz.transition 1989, 9, :o2, 622602000
+          tz.transition 1990, 3, :o3, 638326800
+          tz.transition 1990, 9, :o2, 654656400
+          tz.transition 1991, 3, :o3, 670381200
+          tz.transition 1991, 9, :o2, 686106000
+          tz.transition 1992, 3, :o3, 701830800
+          tz.transition 1992, 9, :o2, 717555600
+          tz.transition 1993, 3, :o3, 733280400
+          tz.transition 1993, 9, :o2, 749005200
+          tz.transition 1994, 3, :o3, 764730000
+          tz.transition 1994, 9, :o2, 780454800
+          tz.transition 1995, 3, :o3, 796179600
+          tz.transition 1995, 9, :o2, 811904400
+          tz.transition 1996, 3, :o3, 828234000
+          tz.transition 1996, 10, :o2, 846378000
+          tz.transition 1997, 3, :o3, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o3, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o3, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o3, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o3, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o3, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o3, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o3, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o3, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o3, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Riga.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Riga.rb
new file mode 100644
index 00000000..784837f7
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Riga.rb
@@ -0,0 +1,176 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Riga
+        include TimezoneDefinition
+        
+        timezone 'Europe/Riga' do |tz|
+          tz.offset :o0, 5784, 0, :LMT
+          tz.offset :o1, 5784, 0, :RMT
+          tz.offset :o2, 5784, 3600, :LST
+          tz.offset :o3, 7200, 0, :EET
+          tz.offset :o4, 10800, 0, :MSK
+          tz.offset :o5, 3600, 3600, :CEST
+          tz.offset :o6, 3600, 0, :CET
+          tz.offset :o7, 10800, 3600, :MSD
+          tz.offset :o8, 7200, 3600, :EEST
+          
+          tz.transition 1879, 12, :o1, 8667775559, 3600
+          tz.transition 1918, 4, :o2, 8718114659, 3600
+          tz.transition 1918, 9, :o1, 8718669059, 3600
+          tz.transition 1919, 4, :o2, 8719378259, 3600
+          tz.transition 1919, 5, :o1, 8719561859, 3600
+          tz.transition 1926, 5, :o3, 8728727159, 3600
+          tz.transition 1940, 8, :o4, 29158157, 12
+          tz.transition 1941, 6, :o5, 19441411, 8
+          tz.transition 1942, 11, :o6, 58335973, 24
+          tz.transition 1943, 3, :o5, 58339501, 24
+          tz.transition 1943, 10, :o6, 58344037, 24
+          tz.transition 1944, 4, :o5, 58348405, 24
+          tz.transition 1944, 10, :o6, 58352773, 24
+          tz.transition 1944, 10, :o4, 58353035, 24
+          tz.transition 1981, 3, :o7, 354920400
+          tz.transition 1981, 9, :o4, 370728000
+          tz.transition 1982, 3, :o7, 386456400
+          tz.transition 1982, 9, :o4, 402264000
+          tz.transition 1983, 3, :o7, 417992400
+          tz.transition 1983, 9, :o4, 433800000
+          tz.transition 1984, 3, :o7, 449614800
+          tz.transition 1984, 9, :o4, 465346800
+          tz.transition 1985, 3, :o7, 481071600
+          tz.transition 1985, 9, :o4, 496796400
+          tz.transition 1986, 3, :o7, 512521200
+          tz.transition 1986, 9, :o4, 528246000
+          tz.transition 1987, 3, :o7, 543970800
+          tz.transition 1987, 9, :o4, 559695600
+          tz.transition 1988, 3, :o7, 575420400
+          tz.transition 1988, 9, :o4, 591145200
+          tz.transition 1989, 3, :o8, 606870000
+          tz.transition 1989, 9, :o3, 622598400
+          tz.transition 1990, 3, :o8, 638323200
+          tz.transition 1990, 9, :o3, 654652800
+          tz.transition 1991, 3, :o8, 670377600
+          tz.transition 1991, 9, :o3, 686102400
+          tz.transition 1992, 3, :o8, 701827200
+          tz.transition 1992, 9, :o3, 717552000
+          tz.transition 1993, 3, :o8, 733276800
+          tz.transition 1993, 9, :o3, 749001600
+          tz.transition 1994, 3, :o8, 764726400
+          tz.transition 1994, 9, :o3, 780451200
+          tz.transition 1995, 3, :o8, 796176000
+          tz.transition 1995, 9, :o3, 811900800
+          tz.transition 1996, 3, :o8, 828230400
+          tz.transition 1996, 9, :o3, 843955200
+          tz.transition 1997, 3, :o8, 859683600
+          tz.transition 1997, 10, :o3, 877827600
+          tz.transition 1998, 3, :o8, 891133200
+          tz.transition 1998, 10, :o3, 909277200
+          tz.transition 1999, 3, :o8, 922582800
+          tz.transition 1999, 10, :o3, 941331600
+          tz.transition 2001, 3, :o8, 985482000
+          tz.transition 2001, 10, :o3, 1004230800
+          tz.transition 2002, 3, :o8, 1017536400
+          tz.transition 2002, 10, :o3, 1035680400
+          tz.transition 2003, 3, :o8, 1048986000
+          tz.transition 2003, 10, :o3, 1067130000
+          tz.transition 2004, 3, :o8, 1080435600
+          tz.transition 2004, 10, :o3, 1099184400
+          tz.transition 2005, 3, :o8, 1111885200
+          tz.transition 2005, 10, :o3, 1130634000
+          tz.transition 2006, 3, :o8, 1143334800
+          tz.transition 2006, 10, :o3, 1162083600
+          tz.transition 2007, 3, :o8, 1174784400
+          tz.transition 2007, 10, :o3, 1193533200
+          tz.transition 2008, 3, :o8, 1206838800
+          tz.transition 2008, 10, :o3, 1224982800
+          tz.transition 2009, 3, :o8, 1238288400
+          tz.transition 2009, 10, :o3, 1256432400
+          tz.transition 2010, 3, :o8, 1269738000
+          tz.transition 2010, 10, :o3, 1288486800
+          tz.transition 2011, 3, :o8, 1301187600
+          tz.transition 2011, 10, :o3, 1319936400
+          tz.transition 2012, 3, :o8, 1332637200
+          tz.transition 2012, 10, :o3, 1351386000
+          tz.transition 2013, 3, :o8, 1364691600
+          tz.transition 2013, 10, :o3, 1382835600
+          tz.transition 2014, 3, :o8, 1396141200
+          tz.transition 2014, 10, :o3, 1414285200
+          tz.transition 2015, 3, :o8, 1427590800
+          tz.transition 2015, 10, :o3, 1445734800
+          tz.transition 2016, 3, :o8, 1459040400
+          tz.transition 2016, 10, :o3, 1477789200
+          tz.transition 2017, 3, :o8, 1490490000
+          tz.transition 2017, 10, :o3, 1509238800
+          tz.transition 2018, 3, :o8, 1521939600
+          tz.transition 2018, 10, :o3, 1540688400
+          tz.transition 2019, 3, :o8, 1553994000
+          tz.transition 2019, 10, :o3, 1572138000
+          tz.transition 2020, 3, :o8, 1585443600
+          tz.transition 2020, 10, :o3, 1603587600
+          tz.transition 2021, 3, :o8, 1616893200
+          tz.transition 2021, 10, :o3, 1635642000
+          tz.transition 2022, 3, :o8, 1648342800
+          tz.transition 2022, 10, :o3, 1667091600
+          tz.transition 2023, 3, :o8, 1679792400
+          tz.transition 2023, 10, :o3, 1698541200
+          tz.transition 2024, 3, :o8, 1711846800
+          tz.transition 2024, 10, :o3, 1729990800
+          tz.transition 2025, 3, :o8, 1743296400
+          tz.transition 2025, 10, :o3, 1761440400
+          tz.transition 2026, 3, :o8, 1774746000
+          tz.transition 2026, 10, :o3, 1792890000
+          tz.transition 2027, 3, :o8, 1806195600
+          tz.transition 2027, 10, :o3, 1824944400
+          tz.transition 2028, 3, :o8, 1837645200
+          tz.transition 2028, 10, :o3, 1856394000
+          tz.transition 2029, 3, :o8, 1869094800
+          tz.transition 2029, 10, :o3, 1887843600
+          tz.transition 2030, 3, :o8, 1901149200
+          tz.transition 2030, 10, :o3, 1919293200
+          tz.transition 2031, 3, :o8, 1932598800
+          tz.transition 2031, 10, :o3, 1950742800
+          tz.transition 2032, 3, :o8, 1964048400
+          tz.transition 2032, 10, :o3, 1982797200
+          tz.transition 2033, 3, :o8, 1995498000
+          tz.transition 2033, 10, :o3, 2014246800
+          tz.transition 2034, 3, :o8, 2026947600
+          tz.transition 2034, 10, :o3, 2045696400
+          tz.transition 2035, 3, :o8, 2058397200
+          tz.transition 2035, 10, :o3, 2077146000
+          tz.transition 2036, 3, :o8, 2090451600
+          tz.transition 2036, 10, :o3, 2108595600
+          tz.transition 2037, 3, :o8, 2121901200
+          tz.transition 2037, 10, :o3, 2140045200
+          tz.transition 2038, 3, :o8, 59172253, 24
+          tz.transition 2038, 10, :o3, 59177461, 24
+          tz.transition 2039, 3, :o8, 59180989, 24
+          tz.transition 2039, 10, :o3, 59186197, 24
+          tz.transition 2040, 3, :o8, 59189725, 24
+          tz.transition 2040, 10, :o3, 59194933, 24
+          tz.transition 2041, 3, :o8, 59198629, 24
+          tz.transition 2041, 10, :o3, 59203669, 24
+          tz.transition 2042, 3, :o8, 59207365, 24
+          tz.transition 2042, 10, :o3, 59212405, 24
+          tz.transition 2043, 3, :o8, 59216101, 24
+          tz.transition 2043, 10, :o3, 59221141, 24
+          tz.transition 2044, 3, :o8, 59224837, 24
+          tz.transition 2044, 10, :o3, 59230045, 24
+          tz.transition 2045, 3, :o8, 59233573, 24
+          tz.transition 2045, 10, :o3, 59238781, 24
+          tz.transition 2046, 3, :o8, 59242309, 24
+          tz.transition 2046, 10, :o3, 59247517, 24
+          tz.transition 2047, 3, :o8, 59251213, 24
+          tz.transition 2047, 10, :o3, 59256253, 24
+          tz.transition 2048, 3, :o8, 59259949, 24
+          tz.transition 2048, 10, :o3, 59264989, 24
+          tz.transition 2049, 3, :o8, 59268685, 24
+          tz.transition 2049, 10, :o3, 59273893, 24
+          tz.transition 2050, 3, :o8, 59277421, 24
+          tz.transition 2050, 10, :o3, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Rome.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Rome.rb
new file mode 100644
index 00000000..aa7b43d9
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Rome.rb
@@ -0,0 +1,215 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Rome
+        include TimezoneDefinition
+        
+        timezone 'Europe/Rome' do |tz|
+          tz.offset :o0, 2996, 0, :LMT
+          tz.offset :o1, 2996, 0, :RMT
+          tz.offset :o2, 3600, 0, :CET
+          tz.offset :o3, 3600, 3600, :CEST
+          
+          tz.transition 1866, 9, :o1, 51901915651, 21600
+          tz.transition 1893, 10, :o2, 52115798851, 21600
+          tz.transition 1916, 6, :o3, 58104419, 24
+          tz.transition 1916, 9, :o2, 58107299, 24
+          tz.transition 1917, 3, :o3, 58111667, 24
+          tz.transition 1917, 9, :o2, 58116035, 24
+          tz.transition 1918, 3, :o3, 58119899, 24
+          tz.transition 1918, 10, :o2, 58124939, 24
+          tz.transition 1919, 3, :o3, 58128467, 24
+          tz.transition 1919, 10, :o2, 58133675, 24
+          tz.transition 1920, 3, :o3, 58137707, 24
+          tz.transition 1920, 9, :o2, 58142075, 24
+          tz.transition 1940, 6, :o3, 58315091, 24
+          tz.transition 1942, 11, :o2, 58335973, 24
+          tz.transition 1943, 3, :o3, 58339501, 24
+          tz.transition 1943, 10, :o2, 58344037, 24
+          tz.transition 1944, 4, :o3, 58348405, 24
+          tz.transition 1944, 9, :o2, 58352411, 24
+          tz.transition 1945, 4, :o3, 58357141, 24
+          tz.transition 1945, 9, :o2, 58361123, 24
+          tz.transition 1946, 3, :o3, 58365517, 24
+          tz.transition 1946, 10, :o2, 58370389, 24
+          tz.transition 1947, 3, :o3, 58374251, 24
+          tz.transition 1947, 10, :o2, 58379123, 24
+          tz.transition 1948, 2, :o3, 58382653, 24
+          tz.transition 1948, 10, :o2, 58387861, 24
+          tz.transition 1966, 5, :o3, 58542419, 24
+          tz.transition 1966, 9, :o2, 29272721, 12
+          tz.transition 1967, 5, :o3, 58551323, 24
+          tz.transition 1967, 9, :o2, 29277089, 12
+          tz.transition 1968, 5, :o3, 58560059, 24
+          tz.transition 1968, 9, :o2, 29281457, 12
+          tz.transition 1969, 5, :o3, 58568963, 24
+          tz.transition 1969, 9, :o2, 29285909, 12
+          tz.transition 1970, 5, :o3, 12956400
+          tz.transition 1970, 9, :o2, 23234400
+          tz.transition 1971, 5, :o3, 43801200
+          tz.transition 1971, 9, :o2, 54687600
+          tz.transition 1972, 5, :o3, 75855600
+          tz.transition 1972, 9, :o2, 86738400
+          tz.transition 1973, 6, :o3, 107910000
+          tz.transition 1973, 9, :o2, 118188000
+          tz.transition 1974, 5, :o3, 138754800
+          tz.transition 1974, 9, :o2, 149637600
+          tz.transition 1975, 5, :o3, 170809200
+          tz.transition 1975, 9, :o2, 181090800
+          tz.transition 1976, 5, :o3, 202258800
+          tz.transition 1976, 9, :o2, 212540400
+          tz.transition 1977, 5, :o3, 233103600
+          tz.transition 1977, 9, :o2, 243990000
+          tz.transition 1978, 5, :o3, 265158000
+          tz.transition 1978, 9, :o2, 276044400
+          tz.transition 1979, 5, :o3, 296607600
+          tz.transition 1979, 9, :o2, 307494000
+          tz.transition 1980, 4, :o3, 323830800
+          tz.transition 1980, 9, :o2, 338950800
+          tz.transition 1981, 3, :o3, 354675600
+          tz.transition 1981, 9, :o2, 370400400
+          tz.transition 1982, 3, :o3, 386125200
+          tz.transition 1982, 9, :o2, 401850000
+          tz.transition 1983, 3, :o3, 417574800
+          tz.transition 1983, 9, :o2, 433299600
+          tz.transition 1984, 3, :o3, 449024400
+          tz.transition 1984, 9, :o2, 465354000
+          tz.transition 1985, 3, :o3, 481078800
+          tz.transition 1985, 9, :o2, 496803600
+          tz.transition 1986, 3, :o3, 512528400
+          tz.transition 1986, 9, :o2, 528253200
+          tz.transition 1987, 3, :o3, 543978000
+          tz.transition 1987, 9, :o2, 559702800
+          tz.transition 1988, 3, :o3, 575427600
+          tz.transition 1988, 9, :o2, 591152400
+          tz.transition 1989, 3, :o3, 606877200
+          tz.transition 1989, 9, :o2, 622602000
+          tz.transition 1990, 3, :o3, 638326800
+          tz.transition 1990, 9, :o2, 654656400
+          tz.transition 1991, 3, :o3, 670381200
+          tz.transition 1991, 9, :o2, 686106000
+          tz.transition 1992, 3, :o3, 701830800
+          tz.transition 1992, 9, :o2, 717555600
+          tz.transition 1993, 3, :o3, 733280400
+          tz.transition 1993, 9, :o2, 749005200
+          tz.transition 1994, 3, :o3, 764730000
+          tz.transition 1994, 9, :o2, 780454800
+          tz.transition 1995, 3, :o3, 796179600
+          tz.transition 1995, 9, :o2, 811904400
+          tz.transition 1996, 3, :o3, 828234000
+          tz.transition 1996, 10, :o2, 846378000
+          tz.transition 1997, 3, :o3, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o3, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o3, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o3, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o3, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o3, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o3, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o3, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o3, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o3, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sarajevo.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sarajevo.rb
new file mode 100644
index 00000000..068c5fe6
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sarajevo.rb
@@ -0,0 +1,13 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Sarajevo
+        include TimezoneDefinition
+        
+        linked_timezone 'Europe/Sarajevo', 'Europe/Belgrade'
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Skopje.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Skopje.rb
new file mode 100644
index 00000000..10b71f28
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Skopje.rb
@@ -0,0 +1,13 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Skopje
+        include TimezoneDefinition
+        
+        linked_timezone 'Europe/Skopje', 'Europe/Belgrade'
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sofia.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sofia.rb
new file mode 100644
index 00000000..38a70ece
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sofia.rb
@@ -0,0 +1,173 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Sofia
+        include TimezoneDefinition
+        
+        timezone 'Europe/Sofia' do |tz|
+          tz.offset :o0, 5596, 0, :LMT
+          tz.offset :o1, 7016, 0, :IMT
+          tz.offset :o2, 7200, 0, :EET
+          tz.offset :o3, 3600, 0, :CET
+          tz.offset :o4, 3600, 3600, :CEST
+          tz.offset :o5, 7200, 3600, :EEST
+          
+          tz.transition 1879, 12, :o1, 52006653401, 21600
+          tz.transition 1894, 11, :o2, 26062154123, 10800
+          tz.transition 1942, 11, :o3, 58335973, 24
+          tz.transition 1943, 3, :o4, 58339501, 24
+          tz.transition 1943, 10, :o3, 58344037, 24
+          tz.transition 1944, 4, :o4, 58348405, 24
+          tz.transition 1944, 10, :o3, 58352773, 24
+          tz.transition 1945, 4, :o2, 29178571, 12
+          tz.transition 1979, 3, :o5, 291762000
+          tz.transition 1979, 9, :o2, 307576800
+          tz.transition 1980, 4, :o5, 323816400
+          tz.transition 1980, 9, :o2, 339026400
+          tz.transition 1981, 4, :o5, 355266000
+          tz.transition 1981, 9, :o2, 370393200
+          tz.transition 1982, 4, :o5, 386715600
+          tz.transition 1982, 9, :o2, 401846400
+          tz.transition 1983, 3, :o5, 417571200
+          tz.transition 1983, 9, :o2, 433296000
+          tz.transition 1984, 3, :o5, 449020800
+          tz.transition 1984, 9, :o2, 465350400
+          tz.transition 1985, 3, :o5, 481075200
+          tz.transition 1985, 9, :o2, 496800000
+          tz.transition 1986, 3, :o5, 512524800
+          tz.transition 1986, 9, :o2, 528249600
+          tz.transition 1987, 3, :o5, 543974400
+          tz.transition 1987, 9, :o2, 559699200
+          tz.transition 1988, 3, :o5, 575424000
+          tz.transition 1988, 9, :o2, 591148800
+          tz.transition 1989, 3, :o5, 606873600
+          tz.transition 1989, 9, :o2, 622598400
+          tz.transition 1990, 3, :o5, 638323200
+          tz.transition 1990, 9, :o2, 654652800
+          tz.transition 1991, 3, :o5, 670370400
+          tz.transition 1991, 9, :o2, 686091600
+          tz.transition 1992, 3, :o5, 701820000
+          tz.transition 1992, 9, :o2, 717541200
+          tz.transition 1993, 3, :o5, 733269600
+          tz.transition 1993, 9, :o2, 748990800
+          tz.transition 1994, 3, :o5, 764719200
+          tz.transition 1994, 9, :o2, 780440400
+          tz.transition 1995, 3, :o5, 796168800
+          tz.transition 1995, 9, :o2, 811890000
+          tz.transition 1996, 3, :o5, 828223200
+          tz.transition 1996, 10, :o2, 846363600
+          tz.transition 1997, 3, :o5, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o5, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o5, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o5, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o5, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o5, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o5, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o5, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o5, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o5, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o5, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o5, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o5, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o5, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o5, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o5, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o5, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o5, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o5, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o5, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o5, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o5, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o5, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o5, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o5, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o5, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o5, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o5, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o5, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o5, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o5, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o5, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o5, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o5, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o5, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o5, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o5, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o5, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o5, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o5, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o5, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o5, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o5, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o5, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o5, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o5, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o5, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o5, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o5, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o5, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o5, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o5, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o5, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o5, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Stockholm.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Stockholm.rb
new file mode 100644
index 00000000..43db70fa
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Stockholm.rb
@@ -0,0 +1,165 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Stockholm
+        include TimezoneDefinition
+        
+        timezone 'Europe/Stockholm' do |tz|
+          tz.offset :o0, 4332, 0, :LMT
+          tz.offset :o1, 3614, 0, :SET
+          tz.offset :o2, 3600, 0, :CET
+          tz.offset :o3, 3600, 3600, :CEST
+          
+          tz.transition 1878, 12, :o1, 17332923239, 7200
+          tz.transition 1899, 12, :o2, 104328883793, 43200
+          tz.transition 1916, 5, :o3, 29051981, 12
+          tz.transition 1916, 9, :o2, 58107299, 24
+          tz.transition 1980, 4, :o3, 323830800
+          tz.transition 1980, 9, :o2, 338950800
+          tz.transition 1981, 3, :o3, 354675600
+          tz.transition 1981, 9, :o2, 370400400
+          tz.transition 1982, 3, :o3, 386125200
+          tz.transition 1982, 9, :o2, 401850000
+          tz.transition 1983, 3, :o3, 417574800
+          tz.transition 1983, 9, :o2, 433299600
+          tz.transition 1984, 3, :o3, 449024400
+          tz.transition 1984, 9, :o2, 465354000
+          tz.transition 1985, 3, :o3, 481078800
+          tz.transition 1985, 9, :o2, 496803600
+          tz.transition 1986, 3, :o3, 512528400
+          tz.transition 1986, 9, :o2, 528253200
+          tz.transition 1987, 3, :o3, 543978000
+          tz.transition 1987, 9, :o2, 559702800
+          tz.transition 1988, 3, :o3, 575427600
+          tz.transition 1988, 9, :o2, 591152400
+          tz.transition 1989, 3, :o3, 606877200
+          tz.transition 1989, 9, :o2, 622602000
+          tz.transition 1990, 3, :o3, 638326800
+          tz.transition 1990, 9, :o2, 654656400
+          tz.transition 1991, 3, :o3, 670381200
+          tz.transition 1991, 9, :o2, 686106000
+          tz.transition 1992, 3, :o3, 701830800
+          tz.transition 1992, 9, :o2, 717555600
+          tz.transition 1993, 3, :o3, 733280400
+          tz.transition 1993, 9, :o2, 749005200
+          tz.transition 1994, 3, :o3, 764730000
+          tz.transition 1994, 9, :o2, 780454800
+          tz.transition 1995, 3, :o3, 796179600
+          tz.transition 1995, 9, :o2, 811904400
+          tz.transition 1996, 3, :o3, 828234000
+          tz.transition 1996, 10, :o2, 846378000
+          tz.transition 1997, 3, :o3, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o3, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o3, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o3, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o3, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o3, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o3, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o3, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o3, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o3, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Tallinn.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Tallinn.rb
new file mode 100644
index 00000000..de5a8569
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Tallinn.rb
@@ -0,0 +1,172 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Tallinn
+        include TimezoneDefinition
+        
+        timezone 'Europe/Tallinn' do |tz|
+          tz.offset :o0, 5940, 0, :LMT
+          tz.offset :o1, 5940, 0, :TMT
+          tz.offset :o2, 3600, 0, :CET
+          tz.offset :o3, 3600, 3600, :CEST
+          tz.offset :o4, 7200, 0, :EET
+          tz.offset :o5, 10800, 0, :MSK
+          tz.offset :o6, 10800, 3600, :MSD
+          tz.offset :o7, 7200, 3600, :EEST
+          
+          tz.transition 1879, 12, :o1, 385234469, 160
+          tz.transition 1918, 1, :o2, 387460069, 160
+          tz.transition 1918, 4, :o3, 58120765, 24
+          tz.transition 1918, 9, :o2, 58124461, 24
+          tz.transition 1919, 6, :o1, 58131371, 24
+          tz.transition 1921, 4, :o4, 387649669, 160
+          tz.transition 1940, 8, :o5, 29158169, 12
+          tz.transition 1941, 9, :o3, 19442019, 8
+          tz.transition 1942, 11, :o2, 58335973, 24
+          tz.transition 1943, 3, :o3, 58339501, 24
+          tz.transition 1943, 10, :o2, 58344037, 24
+          tz.transition 1944, 4, :o3, 58348405, 24
+          tz.transition 1944, 9, :o5, 29176265, 12
+          tz.transition 1981, 3, :o6, 354920400
+          tz.transition 1981, 9, :o5, 370728000
+          tz.transition 1982, 3, :o6, 386456400
+          tz.transition 1982, 9, :o5, 402264000
+          tz.transition 1983, 3, :o6, 417992400
+          tz.transition 1983, 9, :o5, 433800000
+          tz.transition 1984, 3, :o6, 449614800
+          tz.transition 1984, 9, :o5, 465346800
+          tz.transition 1985, 3, :o6, 481071600
+          tz.transition 1985, 9, :o5, 496796400
+          tz.transition 1986, 3, :o6, 512521200
+          tz.transition 1986, 9, :o5, 528246000
+          tz.transition 1987, 3, :o6, 543970800
+          tz.transition 1987, 9, :o5, 559695600
+          tz.transition 1988, 3, :o6, 575420400
+          tz.transition 1988, 9, :o5, 591145200
+          tz.transition 1989, 3, :o7, 606870000
+          tz.transition 1989, 9, :o4, 622598400
+          tz.transition 1990, 3, :o7, 638323200
+          tz.transition 1990, 9, :o4, 654652800
+          tz.transition 1991, 3, :o7, 670377600
+          tz.transition 1991, 9, :o4, 686102400
+          tz.transition 1992, 3, :o7, 701827200
+          tz.transition 1992, 9, :o4, 717552000
+          tz.transition 1993, 3, :o7, 733276800
+          tz.transition 1993, 9, :o4, 749001600
+          tz.transition 1994, 3, :o7, 764726400
+          tz.transition 1994, 9, :o4, 780451200
+          tz.transition 1995, 3, :o7, 796176000
+          tz.transition 1995, 9, :o4, 811900800
+          tz.transition 1996, 3, :o7, 828230400
+          tz.transition 1996, 10, :o4, 846374400
+          tz.transition 1997, 3, :o7, 859680000
+          tz.transition 1997, 10, :o4, 877824000
+          tz.transition 1998, 3, :o7, 891129600
+          tz.transition 1998, 10, :o4, 909277200
+          tz.transition 1999, 3, :o7, 922582800
+          tz.transition 1999, 10, :o4, 941331600
+          tz.transition 2002, 3, :o7, 1017536400
+          tz.transition 2002, 10, :o4, 1035680400
+          tz.transition 2003, 3, :o7, 1048986000
+          tz.transition 2003, 10, :o4, 1067130000
+          tz.transition 2004, 3, :o7, 1080435600
+          tz.transition 2004, 10, :o4, 1099184400
+          tz.transition 2005, 3, :o7, 1111885200
+          tz.transition 2005, 10, :o4, 1130634000
+          tz.transition 2006, 3, :o7, 1143334800
+          tz.transition 2006, 10, :o4, 1162083600
+          tz.transition 2007, 3, :o7, 1174784400
+          tz.transition 2007, 10, :o4, 1193533200
+          tz.transition 2008, 3, :o7, 1206838800
+          tz.transition 2008, 10, :o4, 1224982800
+          tz.transition 2009, 3, :o7, 1238288400
+          tz.transition 2009, 10, :o4, 1256432400
+          tz.transition 2010, 3, :o7, 1269738000
+          tz.transition 2010, 10, :o4, 1288486800
+          tz.transition 2011, 3, :o7, 1301187600
+          tz.transition 2011, 10, :o4, 1319936400
+          tz.transition 2012, 3, :o7, 1332637200
+          tz.transition 2012, 10, :o4, 1351386000
+          tz.transition 2013, 3, :o7, 1364691600
+          tz.transition 2013, 10, :o4, 1382835600
+          tz.transition 2014, 3, :o7, 1396141200
+          tz.transition 2014, 10, :o4, 1414285200
+          tz.transition 2015, 3, :o7, 1427590800
+          tz.transition 2015, 10, :o4, 1445734800
+          tz.transition 2016, 3, :o7, 1459040400
+          tz.transition 2016, 10, :o4, 1477789200
+          tz.transition 2017, 3, :o7, 1490490000
+          tz.transition 2017, 10, :o4, 1509238800
+          tz.transition 2018, 3, :o7, 1521939600
+          tz.transition 2018, 10, :o4, 1540688400
+          tz.transition 2019, 3, :o7, 1553994000
+          tz.transition 2019, 10, :o4, 1572138000
+          tz.transition 2020, 3, :o7, 1585443600
+          tz.transition 2020, 10, :o4, 1603587600
+          tz.transition 2021, 3, :o7, 1616893200
+          tz.transition 2021, 10, :o4, 1635642000
+          tz.transition 2022, 3, :o7, 1648342800
+          tz.transition 2022, 10, :o4, 1667091600
+          tz.transition 2023, 3, :o7, 1679792400
+          tz.transition 2023, 10, :o4, 1698541200
+          tz.transition 2024, 3, :o7, 1711846800
+          tz.transition 2024, 10, :o4, 1729990800
+          tz.transition 2025, 3, :o7, 1743296400
+          tz.transition 2025, 10, :o4, 1761440400
+          tz.transition 2026, 3, :o7, 1774746000
+          tz.transition 2026, 10, :o4, 1792890000
+          tz.transition 2027, 3, :o7, 1806195600
+          tz.transition 2027, 10, :o4, 1824944400
+          tz.transition 2028, 3, :o7, 1837645200
+          tz.transition 2028, 10, :o4, 1856394000
+          tz.transition 2029, 3, :o7, 1869094800
+          tz.transition 2029, 10, :o4, 1887843600
+          tz.transition 2030, 3, :o7, 1901149200
+          tz.transition 2030, 10, :o4, 1919293200
+          tz.transition 2031, 3, :o7, 1932598800
+          tz.transition 2031, 10, :o4, 1950742800
+          tz.transition 2032, 3, :o7, 1964048400
+          tz.transition 2032, 10, :o4, 1982797200
+          tz.transition 2033, 3, :o7, 1995498000
+          tz.transition 2033, 10, :o4, 2014246800
+          tz.transition 2034, 3, :o7, 2026947600
+          tz.transition 2034, 10, :o4, 2045696400
+          tz.transition 2035, 3, :o7, 2058397200
+          tz.transition 2035, 10, :o4, 2077146000
+          tz.transition 2036, 3, :o7, 2090451600
+          tz.transition 2036, 10, :o4, 2108595600
+          tz.transition 2037, 3, :o7, 2121901200
+          tz.transition 2037, 10, :o4, 2140045200
+          tz.transition 2038, 3, :o7, 59172253, 24
+          tz.transition 2038, 10, :o4, 59177461, 24
+          tz.transition 2039, 3, :o7, 59180989, 24
+          tz.transition 2039, 10, :o4, 59186197, 24
+          tz.transition 2040, 3, :o7, 59189725, 24
+          tz.transition 2040, 10, :o4, 59194933, 24
+          tz.transition 2041, 3, :o7, 59198629, 24
+          tz.transition 2041, 10, :o4, 59203669, 24
+          tz.transition 2042, 3, :o7, 59207365, 24
+          tz.transition 2042, 10, :o4, 59212405, 24
+          tz.transition 2043, 3, :o7, 59216101, 24
+          tz.transition 2043, 10, :o4, 59221141, 24
+          tz.transition 2044, 3, :o7, 59224837, 24
+          tz.transition 2044, 10, :o4, 59230045, 24
+          tz.transition 2045, 3, :o7, 59233573, 24
+          tz.transition 2045, 10, :o4, 59238781, 24
+          tz.transition 2046, 3, :o7, 59242309, 24
+          tz.transition 2046, 10, :o4, 59247517, 24
+          tz.transition 2047, 3, :o7, 59251213, 24
+          tz.transition 2047, 10, :o4, 59256253, 24
+          tz.transition 2048, 3, :o7, 59259949, 24
+          tz.transition 2048, 10, :o4, 59264989, 24
+          tz.transition 2049, 3, :o7, 59268685, 24
+          tz.transition 2049, 10, :o4, 59273893, 24
+          tz.transition 2050, 3, :o7, 59277421, 24
+          tz.transition 2050, 10, :o4, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vienna.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vienna.rb
new file mode 100644
index 00000000..990aabab
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vienna.rb
@@ -0,0 +1,183 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Vienna
+        include TimezoneDefinition
+        
+        timezone 'Europe/Vienna' do |tz|
+          tz.offset :o0, 3920, 0, :LMT
+          tz.offset :o1, 3600, 0, :CET
+          tz.offset :o2, 3600, 3600, :CEST
+          
+          tz.transition 1893, 3, :o1, 2605558811, 1080
+          tz.transition 1916, 4, :o2, 29051813, 12
+          tz.transition 1916, 9, :o1, 58107299, 24
+          tz.transition 1917, 4, :o2, 58112029, 24
+          tz.transition 1917, 9, :o1, 58115725, 24
+          tz.transition 1918, 4, :o2, 58120765, 24
+          tz.transition 1918, 9, :o1, 58124461, 24
+          tz.transition 1920, 4, :o2, 58138069, 24
+          tz.transition 1920, 9, :o1, 58141933, 24
+          tz.transition 1940, 4, :o2, 58313293, 24
+          tz.transition 1942, 11, :o1, 58335973, 24
+          tz.transition 1943, 3, :o2, 58339501, 24
+          tz.transition 1943, 10, :o1, 58344037, 24
+          tz.transition 1944, 4, :o2, 58348405, 24
+          tz.transition 1944, 10, :o1, 58352773, 24
+          tz.transition 1945, 4, :o2, 58357141, 24
+          tz.transition 1945, 4, :o1, 58357381, 24
+          tz.transition 1946, 4, :o2, 58366189, 24
+          tz.transition 1946, 10, :o1, 58370389, 24
+          tz.transition 1947, 4, :o2, 58374757, 24
+          tz.transition 1947, 10, :o1, 58379125, 24
+          tz.transition 1948, 4, :o2, 58383829, 24
+          tz.transition 1948, 10, :o1, 58387861, 24
+          tz.transition 1980, 4, :o2, 323823600
+          tz.transition 1980, 9, :o1, 338940000
+          tz.transition 1981, 3, :o2, 354675600
+          tz.transition 1981, 9, :o1, 370400400
+          tz.transition 1982, 3, :o2, 386125200
+          tz.transition 1982, 9, :o1, 401850000
+          tz.transition 1983, 3, :o2, 417574800
+          tz.transition 1983, 9, :o1, 433299600
+          tz.transition 1984, 3, :o2, 449024400
+          tz.transition 1984, 9, :o1, 465354000
+          tz.transition 1985, 3, :o2, 481078800
+          tz.transition 1985, 9, :o1, 496803600
+          tz.transition 1986, 3, :o2, 512528400
+          tz.transition 1986, 9, :o1, 528253200
+          tz.transition 1987, 3, :o2, 543978000
+          tz.transition 1987, 9, :o1, 559702800
+          tz.transition 1988, 3, :o2, 575427600
+          tz.transition 1988, 9, :o1, 591152400
+          tz.transition 1989, 3, :o2, 606877200
+          tz.transition 1989, 9, :o1, 622602000
+          tz.transition 1990, 3, :o2, 638326800
+          tz.transition 1990, 9, :o1, 654656400
+          tz.transition 1991, 3, :o2, 670381200
+          tz.transition 1991, 9, :o1, 686106000
+          tz.transition 1992, 3, :o2, 701830800
+          tz.transition 1992, 9, :o1, 717555600
+          tz.transition 1993, 3, :o2, 733280400
+          tz.transition 1993, 9, :o1, 749005200
+          tz.transition 1994, 3, :o2, 764730000
+          tz.transition 1994, 9, :o1, 780454800
+          tz.transition 1995, 3, :o2, 796179600
+          tz.transition 1995, 9, :o1, 811904400
+          tz.transition 1996, 3, :o2, 828234000
+          tz.transition 1996, 10, :o1, 846378000
+          tz.transition 1997, 3, :o2, 859683600
+          tz.transition 1997, 10, :o1, 877827600
+          tz.transition 1998, 3, :o2, 891133200
+          tz.transition 1998, 10, :o1, 909277200
+          tz.transition 1999, 3, :o2, 922582800
+          tz.transition 1999, 10, :o1, 941331600
+          tz.transition 2000, 3, :o2, 954032400
+          tz.transition 2000, 10, :o1, 972781200
+          tz.transition 2001, 3, :o2, 985482000
+          tz.transition 2001, 10, :o1, 1004230800
+          tz.transition 2002, 3, :o2, 1017536400
+          tz.transition 2002, 10, :o1, 1035680400
+          tz.transition 2003, 3, :o2, 1048986000
+          tz.transition 2003, 10, :o1, 1067130000
+          tz.transition 2004, 3, :o2, 1080435600
+          tz.transition 2004, 10, :o1, 1099184400
+          tz.transition 2005, 3, :o2, 1111885200
+          tz.transition 2005, 10, :o1, 1130634000
+          tz.transition 2006, 3, :o2, 1143334800
+          tz.transition 2006, 10, :o1, 1162083600
+          tz.transition 2007, 3, :o2, 1174784400
+          tz.transition 2007, 10, :o1, 1193533200
+          tz.transition 2008, 3, :o2, 1206838800
+          tz.transition 2008, 10, :o1, 1224982800
+          tz.transition 2009, 3, :o2, 1238288400
+          tz.transition 2009, 10, :o1, 1256432400
+          tz.transition 2010, 3, :o2, 1269738000
+          tz.transition 2010, 10, :o1, 1288486800
+          tz.transition 2011, 3, :o2, 1301187600
+          tz.transition 2011, 10, :o1, 1319936400
+          tz.transition 2012, 3, :o2, 1332637200
+          tz.transition 2012, 10, :o1, 1351386000
+          tz.transition 2013, 3, :o2, 1364691600
+          tz.transition 2013, 10, :o1, 1382835600
+          tz.transition 2014, 3, :o2, 1396141200
+          tz.transition 2014, 10, :o1, 1414285200
+          tz.transition 2015, 3, :o2, 1427590800
+          tz.transition 2015, 10, :o1, 1445734800
+          tz.transition 2016, 3, :o2, 1459040400
+          tz.transition 2016, 10, :o1, 1477789200
+          tz.transition 2017, 3, :o2, 1490490000
+          tz.transition 2017, 10, :o1, 1509238800
+          tz.transition 2018, 3, :o2, 1521939600
+          tz.transition 2018, 10, :o1, 1540688400
+          tz.transition 2019, 3, :o2, 1553994000
+          tz.transition 2019, 10, :o1, 1572138000
+          tz.transition 2020, 3, :o2, 1585443600
+          tz.transition 2020, 10, :o1, 1603587600
+          tz.transition 2021, 3, :o2, 1616893200
+          tz.transition 2021, 10, :o1, 1635642000
+          tz.transition 2022, 3, :o2, 1648342800
+          tz.transition 2022, 10, :o1, 1667091600
+          tz.transition 2023, 3, :o2, 1679792400
+          tz.transition 2023, 10, :o1, 1698541200
+          tz.transition 2024, 3, :o2, 1711846800
+          tz.transition 2024, 10, :o1, 1729990800
+          tz.transition 2025, 3, :o2, 1743296400
+          tz.transition 2025, 10, :o1, 1761440400
+          tz.transition 2026, 3, :o2, 1774746000
+          tz.transition 2026, 10, :o1, 1792890000
+          tz.transition 2027, 3, :o2, 1806195600
+          tz.transition 2027, 10, :o1, 1824944400
+          tz.transition 2028, 3, :o2, 1837645200
+          tz.transition 2028, 10, :o1, 1856394000
+          tz.transition 2029, 3, :o2, 1869094800
+          tz.transition 2029, 10, :o1, 1887843600
+          tz.transition 2030, 3, :o2, 1901149200
+          tz.transition 2030, 10, :o1, 1919293200
+          tz.transition 2031, 3, :o2, 1932598800
+          tz.transition 2031, 10, :o1, 1950742800
+          tz.transition 2032, 3, :o2, 1964048400
+          tz.transition 2032, 10, :o1, 1982797200
+          tz.transition 2033, 3, :o2, 1995498000
+          tz.transition 2033, 10, :o1, 2014246800
+          tz.transition 2034, 3, :o2, 2026947600
+          tz.transition 2034, 10, :o1, 2045696400
+          tz.transition 2035, 3, :o2, 2058397200
+          tz.transition 2035, 10, :o1, 2077146000
+          tz.transition 2036, 3, :o2, 2090451600
+          tz.transition 2036, 10, :o1, 2108595600
+          tz.transition 2037, 3, :o2, 2121901200
+          tz.transition 2037, 10, :o1, 2140045200
+          tz.transition 2038, 3, :o2, 59172253, 24
+          tz.transition 2038, 10, :o1, 59177461, 24
+          tz.transition 2039, 3, :o2, 59180989, 24
+          tz.transition 2039, 10, :o1, 59186197, 24
+          tz.transition 2040, 3, :o2, 59189725, 24
+          tz.transition 2040, 10, :o1, 59194933, 24
+          tz.transition 2041, 3, :o2, 59198629, 24
+          tz.transition 2041, 10, :o1, 59203669, 24
+          tz.transition 2042, 3, :o2, 59207365, 24
+          tz.transition 2042, 10, :o1, 59212405, 24
+          tz.transition 2043, 3, :o2, 59216101, 24
+          tz.transition 2043, 10, :o1, 59221141, 24
+          tz.transition 2044, 3, :o2, 59224837, 24
+          tz.transition 2044, 10, :o1, 59230045, 24
+          tz.transition 2045, 3, :o2, 59233573, 24
+          tz.transition 2045, 10, :o1, 59238781, 24
+          tz.transition 2046, 3, :o2, 59242309, 24
+          tz.transition 2046, 10, :o1, 59247517, 24
+          tz.transition 2047, 3, :o2, 59251213, 24
+          tz.transition 2047, 10, :o1, 59256253, 24
+          tz.transition 2048, 3, :o2, 59259949, 24
+          tz.transition 2048, 10, :o1, 59264989, 24
+          tz.transition 2049, 3, :o2, 59268685, 24
+          tz.transition 2049, 10, :o1, 59273893, 24
+          tz.transition 2050, 3, :o2, 59277421, 24
+          tz.transition 2050, 10, :o1, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vilnius.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vilnius.rb
new file mode 100644
index 00000000..d89d095a
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vilnius.rb
@@ -0,0 +1,170 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Vilnius
+        include TimezoneDefinition
+        
+        timezone 'Europe/Vilnius' do |tz|
+          tz.offset :o0, 6076, 0, :LMT
+          tz.offset :o1, 5040, 0, :WMT
+          tz.offset :o2, 5736, 0, :KMT
+          tz.offset :o3, 3600, 0, :CET
+          tz.offset :o4, 7200, 0, :EET
+          tz.offset :o5, 10800, 0, :MSK
+          tz.offset :o6, 3600, 3600, :CEST
+          tz.offset :o7, 10800, 3600, :MSD
+          tz.offset :o8, 7200, 3600, :EEST
+          
+          tz.transition 1879, 12, :o1, 52006653281, 21600
+          tz.transition 1916, 12, :o2, 290547533, 120
+          tz.transition 1919, 10, :o3, 8720069161, 3600
+          tz.transition 1920, 7, :o4, 58140419, 24
+          tz.transition 1920, 10, :o3, 29071277, 12
+          tz.transition 1940, 8, :o5, 58316267, 24
+          tz.transition 1941, 6, :o6, 19441355, 8
+          tz.transition 1942, 11, :o3, 58335973, 24
+          tz.transition 1943, 3, :o6, 58339501, 24
+          tz.transition 1943, 10, :o3, 58344037, 24
+          tz.transition 1944, 4, :o6, 58348405, 24
+          tz.transition 1944, 7, :o5, 29175641, 12
+          tz.transition 1981, 3, :o7, 354920400
+          tz.transition 1981, 9, :o5, 370728000
+          tz.transition 1982, 3, :o7, 386456400
+          tz.transition 1982, 9, :o5, 402264000
+          tz.transition 1983, 3, :o7, 417992400
+          tz.transition 1983, 9, :o5, 433800000
+          tz.transition 1984, 3, :o7, 449614800
+          tz.transition 1984, 9, :o5, 465346800
+          tz.transition 1985, 3, :o7, 481071600
+          tz.transition 1985, 9, :o5, 496796400
+          tz.transition 1986, 3, :o7, 512521200
+          tz.transition 1986, 9, :o5, 528246000
+          tz.transition 1987, 3, :o7, 543970800
+          tz.transition 1987, 9, :o5, 559695600
+          tz.transition 1988, 3, :o7, 575420400
+          tz.transition 1988, 9, :o5, 591145200
+          tz.transition 1989, 3, :o7, 606870000
+          tz.transition 1989, 9, :o5, 622594800
+          tz.transition 1990, 3, :o7, 638319600
+          tz.transition 1990, 9, :o5, 654649200
+          tz.transition 1991, 3, :o8, 670374000
+          tz.transition 1991, 9, :o4, 686102400
+          tz.transition 1992, 3, :o8, 701827200
+          tz.transition 1992, 9, :o4, 717552000
+          tz.transition 1993, 3, :o8, 733276800
+          tz.transition 1993, 9, :o4, 749001600
+          tz.transition 1994, 3, :o8, 764726400
+          tz.transition 1994, 9, :o4, 780451200
+          tz.transition 1995, 3, :o8, 796176000
+          tz.transition 1995, 9, :o4, 811900800
+          tz.transition 1996, 3, :o8, 828230400
+          tz.transition 1996, 10, :o4, 846374400
+          tz.transition 1997, 3, :o8, 859680000
+          tz.transition 1997, 10, :o4, 877824000
+          tz.transition 1998, 3, :o6, 891133200
+          tz.transition 1998, 10, :o3, 909277200
+          tz.transition 1999, 3, :o6, 922582800
+          tz.transition 1999, 10, :o4, 941331600
+          tz.transition 2003, 3, :o8, 1048986000
+          tz.transition 2003, 10, :o4, 1067130000
+          tz.transition 2004, 3, :o8, 1080435600
+          tz.transition 2004, 10, :o4, 1099184400
+          tz.transition 2005, 3, :o8, 1111885200
+          tz.transition 2005, 10, :o4, 1130634000
+          tz.transition 2006, 3, :o8, 1143334800
+          tz.transition 2006, 10, :o4, 1162083600
+          tz.transition 2007, 3, :o8, 1174784400
+          tz.transition 2007, 10, :o4, 1193533200
+          tz.transition 2008, 3, :o8, 1206838800
+          tz.transition 2008, 10, :o4, 1224982800
+          tz.transition 2009, 3, :o8, 1238288400
+          tz.transition 2009, 10, :o4, 1256432400
+          tz.transition 2010, 3, :o8, 1269738000
+          tz.transition 2010, 10, :o4, 1288486800
+          tz.transition 2011, 3, :o8, 1301187600
+          tz.transition 2011, 10, :o4, 1319936400
+          tz.transition 2012, 3, :o8, 1332637200
+          tz.transition 2012, 10, :o4, 1351386000
+          tz.transition 2013, 3, :o8, 1364691600
+          tz.transition 2013, 10, :o4, 1382835600
+          tz.transition 2014, 3, :o8, 1396141200
+          tz.transition 2014, 10, :o4, 1414285200
+          tz.transition 2015, 3, :o8, 1427590800
+          tz.transition 2015, 10, :o4, 1445734800
+          tz.transition 2016, 3, :o8, 1459040400
+          tz.transition 2016, 10, :o4, 1477789200
+          tz.transition 2017, 3, :o8, 1490490000
+          tz.transition 2017, 10, :o4, 1509238800
+          tz.transition 2018, 3, :o8, 1521939600
+          tz.transition 2018, 10, :o4, 1540688400
+          tz.transition 2019, 3, :o8, 1553994000
+          tz.transition 2019, 10, :o4, 1572138000
+          tz.transition 2020, 3, :o8, 1585443600
+          tz.transition 2020, 10, :o4, 1603587600
+          tz.transition 2021, 3, :o8, 1616893200
+          tz.transition 2021, 10, :o4, 1635642000
+          tz.transition 2022, 3, :o8, 1648342800
+          tz.transition 2022, 10, :o4, 1667091600
+          tz.transition 2023, 3, :o8, 1679792400
+          tz.transition 2023, 10, :o4, 1698541200
+          tz.transition 2024, 3, :o8, 1711846800
+          tz.transition 2024, 10, :o4, 1729990800
+          tz.transition 2025, 3, :o8, 1743296400
+          tz.transition 2025, 10, :o4, 1761440400
+          tz.transition 2026, 3, :o8, 1774746000
+          tz.transition 2026, 10, :o4, 1792890000
+          tz.transition 2027, 3, :o8, 1806195600
+          tz.transition 2027, 10, :o4, 1824944400
+          tz.transition 2028, 3, :o8, 1837645200
+          tz.transition 2028, 10, :o4, 1856394000
+          tz.transition 2029, 3, :o8, 1869094800
+          tz.transition 2029, 10, :o4, 1887843600
+          tz.transition 2030, 3, :o8, 1901149200
+          tz.transition 2030, 10, :o4, 1919293200
+          tz.transition 2031, 3, :o8, 1932598800
+          tz.transition 2031, 10, :o4, 1950742800
+          tz.transition 2032, 3, :o8, 1964048400
+          tz.transition 2032, 10, :o4, 1982797200
+          tz.transition 2033, 3, :o8, 1995498000
+          tz.transition 2033, 10, :o4, 2014246800
+          tz.transition 2034, 3, :o8, 2026947600
+          tz.transition 2034, 10, :o4, 2045696400
+          tz.transition 2035, 3, :o8, 2058397200
+          tz.transition 2035, 10, :o4, 2077146000
+          tz.transition 2036, 3, :o8, 2090451600
+          tz.transition 2036, 10, :o4, 2108595600
+          tz.transition 2037, 3, :o8, 2121901200
+          tz.transition 2037, 10, :o4, 2140045200
+          tz.transition 2038, 3, :o8, 59172253, 24
+          tz.transition 2038, 10, :o4, 59177461, 24
+          tz.transition 2039, 3, :o8, 59180989, 24
+          tz.transition 2039, 10, :o4, 59186197, 24
+          tz.transition 2040, 3, :o8, 59189725, 24
+          tz.transition 2040, 10, :o4, 59194933, 24
+          tz.transition 2041, 3, :o8, 59198629, 24
+          tz.transition 2041, 10, :o4, 59203669, 24
+          tz.transition 2042, 3, :o8, 59207365, 24
+          tz.transition 2042, 10, :o4, 59212405, 24
+          tz.transition 2043, 3, :o8, 59216101, 24
+          tz.transition 2043, 10, :o4, 59221141, 24
+          tz.transition 2044, 3, :o8, 59224837, 24
+          tz.transition 2044, 10, :o4, 59230045, 24
+          tz.transition 2045, 3, :o8, 59233573, 24
+          tz.transition 2045, 10, :o4, 59238781, 24
+          tz.transition 2046, 3, :o8, 59242309, 24
+          tz.transition 2046, 10, :o4, 59247517, 24
+          tz.transition 2047, 3, :o8, 59251213, 24
+          tz.transition 2047, 10, :o4, 59256253, 24
+          tz.transition 2048, 3, :o8, 59259949, 24
+          tz.transition 2048, 10, :o4, 59264989, 24
+          tz.transition 2049, 3, :o8, 59268685, 24
+          tz.transition 2049, 10, :o4, 59273893, 24
+          tz.transition 2050, 3, :o8, 59277421, 24
+          tz.transition 2050, 10, :o4, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Warsaw.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Warsaw.rb
new file mode 100644
index 00000000..7fa51c26
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Warsaw.rb
@@ -0,0 +1,212 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Warsaw
+        include TimezoneDefinition
+        
+        timezone 'Europe/Warsaw' do |tz|
+          tz.offset :o0, 5040, 0, :LMT
+          tz.offset :o1, 5040, 0, :WMT
+          tz.offset :o2, 3600, 0, :CET
+          tz.offset :o3, 3600, 3600, :CEST
+          tz.offset :o4, 7200, 0, :EET
+          tz.offset :o5, 7200, 3600, :EEST
+          
+          tz.transition 1879, 12, :o1, 288925853, 120
+          tz.transition 1915, 8, :o2, 290485733, 120
+          tz.transition 1916, 4, :o3, 29051813, 12
+          tz.transition 1916, 9, :o2, 58107299, 24
+          tz.transition 1917, 4, :o3, 58112029, 24
+          tz.transition 1917, 9, :o2, 58115725, 24
+          tz.transition 1918, 4, :o3, 58120765, 24
+          tz.transition 1918, 9, :o4, 58124461, 24
+          tz.transition 1919, 4, :o5, 4844127, 2
+          tz.transition 1919, 9, :o4, 4844435, 2
+          tz.transition 1922, 5, :o2, 29078477, 12
+          tz.transition 1940, 6, :o3, 58315285, 24
+          tz.transition 1942, 11, :o2, 58335973, 24
+          tz.transition 1943, 3, :o3, 58339501, 24
+          tz.transition 1943, 10, :o2, 58344037, 24
+          tz.transition 1944, 4, :o3, 58348405, 24
+          tz.transition 1944, 10, :o2, 4862735, 2
+          tz.transition 1945, 4, :o3, 58357787, 24
+          tz.transition 1945, 10, :o2, 29181125, 12
+          tz.transition 1946, 4, :o3, 58366187, 24
+          tz.transition 1946, 10, :o2, 58370413, 24
+          tz.transition 1947, 5, :o3, 58375429, 24
+          tz.transition 1947, 10, :o2, 58379125, 24
+          tz.transition 1948, 4, :o3, 58383829, 24
+          tz.transition 1948, 10, :o2, 58387861, 24
+          tz.transition 1949, 4, :o3, 58392397, 24
+          tz.transition 1949, 10, :o2, 58396597, 24
+          tz.transition 1957, 6, :o3, 4871983, 2
+          tz.transition 1957, 9, :o2, 4872221, 2
+          tz.transition 1958, 3, :o3, 4872585, 2
+          tz.transition 1958, 9, :o2, 4872949, 2
+          tz.transition 1959, 5, :o3, 4873439, 2
+          tz.transition 1959, 10, :o2, 4873691, 2
+          tz.transition 1960, 4, :o3, 4874055, 2
+          tz.transition 1960, 10, :o2, 4874419, 2
+          tz.transition 1961, 5, :o3, 4874895, 2
+          tz.transition 1961, 10, :o2, 4875147, 2
+          tz.transition 1962, 5, :o3, 4875623, 2
+          tz.transition 1962, 9, :o2, 4875875, 2
+          tz.transition 1963, 5, :o3, 4876351, 2
+          tz.transition 1963, 9, :o2, 4876603, 2
+          tz.transition 1964, 5, :o3, 4877093, 2
+          tz.transition 1964, 9, :o2, 4877331, 2
+          tz.transition 1977, 4, :o3, 228873600
+          tz.transition 1977, 9, :o2, 243993600
+          tz.transition 1978, 4, :o3, 260323200
+          tz.transition 1978, 10, :o2, 276048000
+          tz.transition 1979, 4, :o3, 291772800
+          tz.transition 1979, 9, :o2, 307497600
+          tz.transition 1980, 4, :o3, 323827200
+          tz.transition 1980, 9, :o2, 338947200
+          tz.transition 1981, 3, :o3, 354672000
+          tz.transition 1981, 9, :o2, 370396800
+          tz.transition 1982, 3, :o3, 386121600
+          tz.transition 1982, 9, :o2, 401846400
+          tz.transition 1983, 3, :o3, 417571200
+          tz.transition 1983, 9, :o2, 433296000
+          tz.transition 1984, 3, :o3, 449020800
+          tz.transition 1984, 9, :o2, 465350400
+          tz.transition 1985, 3, :o3, 481075200
+          tz.transition 1985, 9, :o2, 496800000
+          tz.transition 1986, 3, :o3, 512524800
+          tz.transition 1986, 9, :o2, 528249600
+          tz.transition 1987, 3, :o3, 543974400
+          tz.transition 1987, 9, :o2, 559699200
+          tz.transition 1988, 3, :o3, 575427600
+          tz.transition 1988, 9, :o2, 591152400
+          tz.transition 1989, 3, :o3, 606877200
+          tz.transition 1989, 9, :o2, 622602000
+          tz.transition 1990, 3, :o3, 638326800
+          tz.transition 1990, 9, :o2, 654656400
+          tz.transition 1991, 3, :o3, 670381200
+          tz.transition 1991, 9, :o2, 686106000
+          tz.transition 1992, 3, :o3, 701830800
+          tz.transition 1992, 9, :o2, 717555600
+          tz.transition 1993, 3, :o3, 733280400
+          tz.transition 1993, 9, :o2, 749005200
+          tz.transition 1994, 3, :o3, 764730000
+          tz.transition 1994, 9, :o2, 780454800
+          tz.transition 1995, 3, :o3, 796179600
+          tz.transition 1995, 9, :o2, 811904400
+          tz.transition 1996, 3, :o3, 828234000
+          tz.transition 1996, 10, :o2, 846378000
+          tz.transition 1997, 3, :o3, 859683600
+          tz.transition 1997, 10, :o2, 877827600
+          tz.transition 1998, 3, :o3, 891133200
+          tz.transition 1998, 10, :o2, 909277200
+          tz.transition 1999, 3, :o3, 922582800
+          tz.transition 1999, 10, :o2, 941331600
+          tz.transition 2000, 3, :o3, 954032400
+          tz.transition 2000, 10, :o2, 972781200
+          tz.transition 2001, 3, :o3, 985482000
+          tz.transition 2001, 10, :o2, 1004230800
+          tz.transition 2002, 3, :o3, 1017536400
+          tz.transition 2002, 10, :o2, 1035680400
+          tz.transition 2003, 3, :o3, 1048986000
+          tz.transition 2003, 10, :o2, 1067130000
+          tz.transition 2004, 3, :o3, 1080435600
+          tz.transition 2004, 10, :o2, 1099184400
+          tz.transition 2005, 3, :o3, 1111885200
+          tz.transition 2005, 10, :o2, 1130634000
+          tz.transition 2006, 3, :o3, 1143334800
+          tz.transition 2006, 10, :o2, 1162083600
+          tz.transition 2007, 3, :o3, 1174784400
+          tz.transition 2007, 10, :o2, 1193533200
+          tz.transition 2008, 3, :o3, 1206838800
+          tz.transition 2008, 10, :o2, 1224982800
+          tz.transition 2009, 3, :o3, 1238288400
+          tz.transition 2009, 10, :o2, 1256432400
+          tz.transition 2010, 3, :o3, 1269738000
+          tz.transition 2010, 10, :o2, 1288486800
+          tz.transition 2011, 3, :o3, 1301187600
+          tz.transition 2011, 10, :o2, 1319936400
+          tz.transition 2012, 3, :o3, 1332637200
+          tz.transition 2012, 10, :o2, 1351386000
+          tz.transition 2013, 3, :o3, 1364691600
+          tz.transition 2013, 10, :o2, 1382835600
+          tz.transition 2014, 3, :o3, 1396141200
+          tz.transition 2014, 10, :o2, 1414285200
+          tz.transition 2015, 3, :o3, 1427590800
+          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2016, 3, :o3, 1459040400
+          tz.transition 2016, 10, :o2, 1477789200
+          tz.transition 2017, 3, :o3, 1490490000
+          tz.transition 2017, 10, :o2, 1509238800
+          tz.transition 2018, 3, :o3, 1521939600
+          tz.transition 2018, 10, :o2, 1540688400
+          tz.transition 2019, 3, :o3, 1553994000
+          tz.transition 2019, 10, :o2, 1572138000
+          tz.transition 2020, 3, :o3, 1585443600
+          tz.transition 2020, 10, :o2, 1603587600
+          tz.transition 2021, 3, :o3, 1616893200
+          tz.transition 2021, 10, :o2, 1635642000
+          tz.transition 2022, 3, :o3, 1648342800
+          tz.transition 2022, 10, :o2, 1667091600
+          tz.transition 2023, 3, :o3, 1679792400
+          tz.transition 2023, 10, :o2, 1698541200
+          tz.transition 2024, 3, :o3, 1711846800
+          tz.transition 2024, 10, :o2, 1729990800
+          tz.transition 2025, 3, :o3, 1743296400
+          tz.transition 2025, 10, :o2, 1761440400
+          tz.transition 2026, 3, :o3, 1774746000
+          tz.transition 2026, 10, :o2, 1792890000
+          tz.transition 2027, 3, :o3, 1806195600
+          tz.transition 2027, 10, :o2, 1824944400
+          tz.transition 2028, 3, :o3, 1837645200
+          tz.transition 2028, 10, :o2, 1856394000
+          tz.transition 2029, 3, :o3, 1869094800
+          tz.transition 2029, 10, :o2, 1887843600
+          tz.transition 2030, 3, :o3, 1901149200
+          tz.transition 2030, 10, :o2, 1919293200
+          tz.transition 2031, 3, :o3, 1932598800
+          tz.transition 2031, 10, :o2, 1950742800
+          tz.transition 2032, 3, :o3, 1964048400
+          tz.transition 2032, 10, :o2, 1982797200
+          tz.transition 2033, 3, :o3, 1995498000
+          tz.transition 2033, 10, :o2, 2014246800
+          tz.transition 2034, 3, :o3, 2026947600
+          tz.transition 2034, 10, :o2, 2045696400
+          tz.transition 2035, 3, :o3, 2058397200
+          tz.transition 2035, 10, :o2, 2077146000
+          tz.transition 2036, 3, :o3, 2090451600
+          tz.transition 2036, 10, :o2, 2108595600
+          tz.transition 2037, 3, :o3, 2121901200
+          tz.transition 2037, 10, :o2, 2140045200
+          tz.transition 2038, 3, :o3, 59172253, 24
+          tz.transition 2038, 10, :o2, 59177461, 24
+          tz.transition 2039, 3, :o3, 59180989, 24
+          tz.transition 2039, 10, :o2, 59186197, 24
+          tz.transition 2040, 3, :o3, 59189725, 24
+          tz.transition 2040, 10, :o2, 59194933, 24
+          tz.transition 2041, 3, :o3, 59198629, 24
+          tz.transition 2041, 10, :o2, 59203669, 24
+          tz.transition 2042, 3, :o3, 59207365, 24
+          tz.transition 2042, 10, :o2, 59212405, 24
+          tz.transition 2043, 3, :o3, 59216101, 24
+          tz.transition 2043, 10, :o2, 59221141, 24
+          tz.transition 2044, 3, :o3, 59224837, 24
+          tz.transition 2044, 10, :o2, 59230045, 24
+          tz.transition 2045, 3, :o3, 59233573, 24
+          tz.transition 2045, 10, :o2, 59238781, 24
+          tz.transition 2046, 3, :o3, 59242309, 24
+          tz.transition 2046, 10, :o2, 59247517, 24
+          tz.transition 2047, 3, :o3, 59251213, 24
+          tz.transition 2047, 10, :o2, 59256253, 24
+          tz.transition 2048, 3, :o3, 59259949, 24
+          tz.transition 2048, 10, :o2, 59264989, 24
+          tz.transition 2049, 3, :o3, 59268685, 24
+          tz.transition 2049, 10, :o2, 59273893, 24
+          tz.transition 2050, 3, :o3, 59277421, 24
+          tz.transition 2050, 10, :o2, 59282629, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Zagreb.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Zagreb.rb
new file mode 100644
index 00000000..ecdd903d
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Zagreb.rb
@@ -0,0 +1,13 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Europe
+      module Zagreb
+        include TimezoneDefinition
+        
+        linked_timezone 'Europe/Zagreb', 'Europe/Belgrade'
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Auckland.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Auckland.rb
new file mode 100644
index 00000000..a524fd6b
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Auckland.rb
@@ -0,0 +1,202 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Auckland
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Auckland' do |tz|
+          tz.offset :o0, 41944, 0, :LMT
+          tz.offset :o1, 41400, 0, :NZMT
+          tz.offset :o2, 41400, 3600, :NZST
+          tz.offset :o3, 41400, 1800, :NZST
+          tz.offset :o4, 43200, 0, :NZST
+          tz.offset :o5, 43200, 3600, :NZDT
+          
+          tz.transition 1868, 11, :o1, 25959290557, 10800
+          tz.transition 1927, 11, :o2, 116409125, 48
+          tz.transition 1928, 3, :o1, 38804945, 16
+          tz.transition 1928, 10, :o3, 116425589, 48
+          tz.transition 1929, 3, :o1, 29108245, 12
+          tz.transition 1929, 10, :o3, 116443061, 48
+          tz.transition 1930, 3, :o1, 29112613, 12
+          tz.transition 1930, 10, :o3, 116460533, 48
+          tz.transition 1931, 3, :o1, 29116981, 12
+          tz.transition 1931, 10, :o3, 116478005, 48
+          tz.transition 1932, 3, :o1, 29121433, 12
+          tz.transition 1932, 10, :o3, 116495477, 48
+          tz.transition 1933, 3, :o1, 29125801, 12
+          tz.transition 1933, 10, :o3, 116512949, 48
+          tz.transition 1934, 4, :o1, 29130673, 12
+          tz.transition 1934, 9, :o3, 116530085, 48
+          tz.transition 1935, 4, :o1, 29135041, 12
+          tz.transition 1935, 9, :o3, 116547557, 48
+          tz.transition 1936, 4, :o1, 29139409, 12
+          tz.transition 1936, 9, :o3, 116565029, 48
+          tz.transition 1937, 4, :o1, 29143777, 12
+          tz.transition 1937, 9, :o3, 116582501, 48
+          tz.transition 1938, 4, :o1, 29148145, 12
+          tz.transition 1938, 9, :o3, 116599973, 48
+          tz.transition 1939, 4, :o1, 29152597, 12
+          tz.transition 1939, 9, :o3, 116617445, 48
+          tz.transition 1940, 4, :o1, 29156965, 12
+          tz.transition 1940, 9, :o3, 116635253, 48
+          tz.transition 1945, 12, :o4, 2431821, 1
+          tz.transition 1974, 11, :o5, 152632800
+          tz.transition 1975, 2, :o4, 162309600
+          tz.transition 1975, 10, :o5, 183477600
+          tz.transition 1976, 3, :o4, 194968800
+          tz.transition 1976, 10, :o5, 215532000
+          tz.transition 1977, 3, :o4, 226418400
+          tz.transition 1977, 10, :o5, 246981600
+          tz.transition 1978, 3, :o4, 257868000
+          tz.transition 1978, 10, :o5, 278431200
+          tz.transition 1979, 3, :o4, 289317600
+          tz.transition 1979, 10, :o5, 309880800
+          tz.transition 1980, 3, :o4, 320767200
+          tz.transition 1980, 10, :o5, 341330400
+          tz.transition 1981, 2, :o4, 352216800
+          tz.transition 1981, 10, :o5, 372780000
+          tz.transition 1982, 3, :o4, 384271200
+          tz.transition 1982, 10, :o5, 404834400
+          tz.transition 1983, 3, :o4, 415720800
+          tz.transition 1983, 10, :o5, 436284000
+          tz.transition 1984, 3, :o4, 447170400
+          tz.transition 1984, 10, :o5, 467733600
+          tz.transition 1985, 3, :o4, 478620000
+          tz.transition 1985, 10, :o5, 499183200
+          tz.transition 1986, 3, :o4, 510069600
+          tz.transition 1986, 10, :o5, 530632800
+          tz.transition 1987, 2, :o4, 541519200
+          tz.transition 1987, 10, :o5, 562082400
+          tz.transition 1988, 3, :o4, 573573600
+          tz.transition 1988, 10, :o5, 594136800
+          tz.transition 1989, 3, :o4, 605023200
+          tz.transition 1989, 10, :o5, 623772000
+          tz.transition 1990, 3, :o4, 637682400
+          tz.transition 1990, 10, :o5, 655221600
+          tz.transition 1991, 3, :o4, 669132000
+          tz.transition 1991, 10, :o5, 686671200
+          tz.transition 1992, 3, :o4, 700581600
+          tz.transition 1992, 10, :o5, 718120800
+          tz.transition 1993, 3, :o4, 732636000
+          tz.transition 1993, 10, :o5, 749570400
+          tz.transition 1994, 3, :o4, 764085600
+          tz.transition 1994, 10, :o5, 781020000
+          tz.transition 1995, 3, :o4, 795535200
+          tz.transition 1995, 9, :o5, 812469600
+          tz.transition 1996, 3, :o4, 826984800
+          tz.transition 1996, 10, :o5, 844524000
+          tz.transition 1997, 3, :o4, 858434400
+          tz.transition 1997, 10, :o5, 875973600
+          tz.transition 1998, 3, :o4, 889884000
+          tz.transition 1998, 10, :o5, 907423200
+          tz.transition 1999, 3, :o4, 921938400
+          tz.transition 1999, 10, :o5, 938872800
+          tz.transition 2000, 3, :o4, 953388000
+          tz.transition 2000, 9, :o5, 970322400
+          tz.transition 2001, 3, :o4, 984837600
+          tz.transition 2001, 10, :o5, 1002376800
+          tz.transition 2002, 3, :o4, 1016287200
+          tz.transition 2002, 10, :o5, 1033826400
+          tz.transition 2003, 3, :o4, 1047736800
+          tz.transition 2003, 10, :o5, 1065276000
+          tz.transition 2004, 3, :o4, 1079791200
+          tz.transition 2004, 10, :o5, 1096725600
+          tz.transition 2005, 3, :o4, 1111240800
+          tz.transition 2005, 10, :o5, 1128175200
+          tz.transition 2006, 3, :o4, 1142690400
+          tz.transition 2006, 9, :o5, 1159624800
+          tz.transition 2007, 3, :o4, 1174140000
+          tz.transition 2007, 9, :o5, 1191074400
+          tz.transition 2008, 4, :o4, 1207404000
+          tz.transition 2008, 9, :o5, 1222524000
+          tz.transition 2009, 4, :o4, 1238853600
+          tz.transition 2009, 9, :o5, 1253973600
+          tz.transition 2010, 4, :o4, 1270303200
+          tz.transition 2010, 9, :o5, 1285423200
+          tz.transition 2011, 4, :o4, 1301752800
+          tz.transition 2011, 9, :o5, 1316872800
+          tz.transition 2012, 3, :o4, 1333202400
+          tz.transition 2012, 9, :o5, 1348927200
+          tz.transition 2013, 4, :o4, 1365256800
+          tz.transition 2013, 9, :o5, 1380376800
+          tz.transition 2014, 4, :o4, 1396706400
+          tz.transition 2014, 9, :o5, 1411826400
+          tz.transition 2015, 4, :o4, 1428156000
+          tz.transition 2015, 9, :o5, 1443276000
+          tz.transition 2016, 4, :o4, 1459605600
+          tz.transition 2016, 9, :o5, 1474725600
+          tz.transition 2017, 4, :o4, 1491055200
+          tz.transition 2017, 9, :o5, 1506175200
+          tz.transition 2018, 3, :o4, 1522504800
+          tz.transition 2018, 9, :o5, 1538229600
+          tz.transition 2019, 4, :o4, 1554559200
+          tz.transition 2019, 9, :o5, 1569679200
+          tz.transition 2020, 4, :o4, 1586008800
+          tz.transition 2020, 9, :o5, 1601128800
+          tz.transition 2021, 4, :o4, 1617458400
+          tz.transition 2021, 9, :o5, 1632578400
+          tz.transition 2022, 4, :o4, 1648908000
+          tz.transition 2022, 9, :o5, 1664028000
+          tz.transition 2023, 4, :o4, 1680357600
+          tz.transition 2023, 9, :o5, 1695477600
+          tz.transition 2024, 4, :o4, 1712412000
+          tz.transition 2024, 9, :o5, 1727532000
+          tz.transition 2025, 4, :o4, 1743861600
+          tz.transition 2025, 9, :o5, 1758981600
+          tz.transition 2026, 4, :o4, 1775311200
+          tz.transition 2026, 9, :o5, 1790431200
+          tz.transition 2027, 4, :o4, 1806760800
+          tz.transition 2027, 9, :o5, 1821880800
+          tz.transition 2028, 4, :o4, 1838210400
+          tz.transition 2028, 9, :o5, 1853330400
+          tz.transition 2029, 3, :o4, 1869660000
+          tz.transition 2029, 9, :o5, 1885384800
+          tz.transition 2030, 4, :o4, 1901714400
+          tz.transition 2030, 9, :o5, 1916834400
+          tz.transition 2031, 4, :o4, 1933164000
+          tz.transition 2031, 9, :o5, 1948284000
+          tz.transition 2032, 4, :o4, 1964613600
+          tz.transition 2032, 9, :o5, 1979733600
+          tz.transition 2033, 4, :o4, 1996063200
+          tz.transition 2033, 9, :o5, 2011183200
+          tz.transition 2034, 4, :o4, 2027512800
+          tz.transition 2034, 9, :o5, 2042632800
+          tz.transition 2035, 3, :o4, 2058962400
+          tz.transition 2035, 9, :o5, 2074687200
+          tz.transition 2036, 4, :o4, 2091016800
+          tz.transition 2036, 9, :o5, 2106136800
+          tz.transition 2037, 4, :o4, 2122466400
+          tz.transition 2037, 9, :o5, 2137586400
+          tz.transition 2038, 4, :o4, 29586205, 12
+          tz.transition 2038, 9, :o5, 29588305, 12
+          tz.transition 2039, 4, :o4, 29590573, 12
+          tz.transition 2039, 9, :o5, 29592673, 12
+          tz.transition 2040, 3, :o4, 29594941, 12
+          tz.transition 2040, 9, :o5, 29597125, 12
+          tz.transition 2041, 4, :o4, 29599393, 12
+          tz.transition 2041, 9, :o5, 29601493, 12
+          tz.transition 2042, 4, :o4, 29603761, 12
+          tz.transition 2042, 9, :o5, 29605861, 12
+          tz.transition 2043, 4, :o4, 29608129, 12
+          tz.transition 2043, 9, :o5, 29610229, 12
+          tz.transition 2044, 4, :o4, 29612497, 12
+          tz.transition 2044, 9, :o5, 29614597, 12
+          tz.transition 2045, 4, :o4, 29616865, 12
+          tz.transition 2045, 9, :o5, 29618965, 12
+          tz.transition 2046, 3, :o4, 29621233, 12
+          tz.transition 2046, 9, :o5, 29623417, 12
+          tz.transition 2047, 4, :o4, 29625685, 12
+          tz.transition 2047, 9, :o5, 29627785, 12
+          tz.transition 2048, 4, :o4, 29630053, 12
+          tz.transition 2048, 9, :o5, 29632153, 12
+          tz.transition 2049, 4, :o4, 29634421, 12
+          tz.transition 2049, 9, :o5, 29636521, 12
+          tz.transition 2050, 4, :o4, 29638789, 12
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Fiji.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Fiji.rb
new file mode 100644
index 00000000..5fe9bbd9
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Fiji.rb
@@ -0,0 +1,23 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Fiji
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Fiji' do |tz|
+          tz.offset :o0, 42820, 0, :LMT
+          tz.offset :o1, 43200, 0, :FJT
+          tz.offset :o2, 43200, 3600, :FJST
+          
+          tz.transition 1915, 10, :o1, 10457838739, 4320
+          tz.transition 1998, 10, :o2, 909842400
+          tz.transition 1999, 2, :o1, 920124000
+          tz.transition 1999, 11, :o2, 941896800
+          tz.transition 2000, 2, :o1, 951573600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Guam.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Guam.rb
new file mode 100644
index 00000000..d4c1a0a6
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Guam.rb
@@ -0,0 +1,22 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Guam
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Guam' do |tz|
+          tz.offset :o0, -51660, 0, :LMT
+          tz.offset :o1, 34740, 0, :LMT
+          tz.offset :o2, 36000, 0, :GST
+          tz.offset :o3, 36000, 0, :ChST
+          
+          tz.transition 1844, 12, :o1, 1149567407, 480
+          tz.transition 1900, 12, :o2, 1159384847, 480
+          tz.transition 2000, 12, :o3, 977493600
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Honolulu.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Honolulu.rb
new file mode 100644
index 00000000..204b2265
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Honolulu.rb
@@ -0,0 +1,28 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Honolulu
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Honolulu' do |tz|
+          tz.offset :o0, -37886, 0, :LMT
+          tz.offset :o1, -37800, 0, :HST
+          tz.offset :o2, -37800, 3600, :HDT
+          tz.offset :o3, -37800, 3600, :HWT
+          tz.offset :o4, -37800, 3600, :HPT
+          tz.offset :o5, -36000, 0, :HST
+          
+          tz.transition 1900, 1, :o1, 104328926143, 43200
+          tz.transition 1933, 4, :o2, 116505265, 48
+          tz.transition 1933, 5, :o1, 116506271, 48
+          tz.transition 1942, 2, :o3, 116659201, 48
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o1, 116722991, 48
+          tz.transition 1947, 6, :o5, 116752561, 48
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Majuro.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Majuro.rb
new file mode 100644
index 00000000..32adad92
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Majuro.rb
@@ -0,0 +1,20 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Majuro
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Majuro' do |tz|
+          tz.offset :o0, 41088, 0, :LMT
+          tz.offset :o1, 39600, 0, :MHT
+          tz.offset :o2, 43200, 0, :MHT
+          
+          tz.transition 1900, 12, :o1, 1086923261, 450
+          tz.transition 1969, 9, :o2, 58571881, 24
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Midway.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Midway.rb
new file mode 100644
index 00000000..97784fcc
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Midway.rb
@@ -0,0 +1,25 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Midway
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Midway' do |tz|
+          tz.offset :o0, -42568, 0, :LMT
+          tz.offset :o1, -39600, 0, :NST
+          tz.offset :o2, -39600, 3600, :NDT
+          tz.offset :o3, -39600, 0, :BST
+          tz.offset :o4, -39600, 0, :SST
+          
+          tz.transition 1901, 1, :o1, 26086168721, 10800
+          tz.transition 1956, 6, :o2, 58455071, 24
+          tz.transition 1956, 9, :o1, 29228627, 12
+          tz.transition 1967, 4, :o3, 58549967, 24
+          tz.transition 1983, 11, :o4, 439038000
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Noumea.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Noumea.rb
new file mode 100644
index 00000000..70173db8
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Noumea.rb
@@ -0,0 +1,25 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Noumea
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Noumea' do |tz|
+          tz.offset :o0, 39948, 0, :LMT
+          tz.offset :o1, 39600, 0, :NCT
+          tz.offset :o2, 39600, 3600, :NCST
+          
+          tz.transition 1912, 1, :o1, 17419781071, 7200
+          tz.transition 1977, 12, :o2, 250002000
+          tz.transition 1978, 2, :o1, 257342400
+          tz.transition 1978, 12, :o2, 281451600
+          tz.transition 1979, 2, :o1, 288878400
+          tz.transition 1996, 11, :o2, 849366000
+          tz.transition 1997, 3, :o1, 857228400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Pago_Pago.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Pago_Pago.rb
new file mode 100644
index 00000000..c8fcd7d5
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Pago_Pago.rb
@@ -0,0 +1,26 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Pago_Pago
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Pago_Pago' do |tz|
+          tz.offset :o0, 45432, 0, :LMT
+          tz.offset :o1, -40968, 0, :LMT
+          tz.offset :o2, -41400, 0, :SAMT
+          tz.offset :o3, -39600, 0, :NST
+          tz.offset :o4, -39600, 0, :BST
+          tz.offset :o5, -39600, 0, :SST
+          
+          tz.transition 1879, 7, :o1, 2889041969, 1200
+          tz.transition 1911, 1, :o2, 2902845569, 1200
+          tz.transition 1950, 1, :o3, 116797583, 48
+          tz.transition 1967, 4, :o4, 58549967, 24
+          tz.transition 1983, 11, :o5, 439038000
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Port_Moresby.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Port_Moresby.rb
new file mode 100644
index 00000000..f06cf6d5
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Port_Moresby.rb
@@ -0,0 +1,20 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Port_Moresby
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Port_Moresby' do |tz|
+          tz.offset :o0, 35320, 0, :LMT
+          tz.offset :o1, 35312, 0, :PMMT
+          tz.offset :o2, 36000, 0, :PGT
+          
+          tz.transition 1879, 12, :o1, 5200664597, 2160
+          tz.transition 1894, 12, :o2, 13031248093, 5400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Tongatapu.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Tongatapu.rb
new file mode 100644
index 00000000..7578d92f
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Tongatapu.rb
@@ -0,0 +1,27 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Pacific
+      module Tongatapu
+        include TimezoneDefinition
+        
+        timezone 'Pacific/Tongatapu' do |tz|
+          tz.offset :o0, 44360, 0, :LMT
+          tz.offset :o1, 44400, 0, :TOT
+          tz.offset :o2, 46800, 0, :TOT
+          tz.offset :o3, 46800, 3600, :TOST
+          
+          tz.transition 1900, 12, :o1, 5217231571, 2160
+          tz.transition 1940, 12, :o2, 174959639, 72
+          tz.transition 1999, 10, :o3, 939214800
+          tz.transition 2000, 3, :o2, 953384400
+          tz.transition 2000, 11, :o3, 973342800
+          tz.transition 2001, 1, :o2, 980596800
+          tz.transition 2001, 11, :o3, 1004792400
+          tz.transition 2002, 1, :o2, 1012046400
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/info_timezone.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/info_timezone.rb
new file mode 100644
index 00000000..001303c5
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/info_timezone.rb
@@ -0,0 +1,52 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'tzinfo/timezone'
+
+module TZInfo
+
+  # A Timezone based on a TimezoneInfo.
+  class InfoTimezone < Timezone #:nodoc:
+    
+    # Constructs a new InfoTimezone with a TimezoneInfo instance.
+    def self.new(info)      
+      tz = super()
+      tz.send(:setup, info)
+      tz
+    end
+    
+    # The identifier of the timezone, e.g. "Europe/Paris".
+    def identifier
+      @info.identifier
+    end
+    
+    protected
+      # The TimezoneInfo for this Timezone.
+      def info
+        @info
+      end
+          
+      def setup(info)
+        @info = info
+      end
+  end    
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone.rb
new file mode 100644
index 00000000..f8ec4fca
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone.rb
@@ -0,0 +1,51 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'tzinfo/info_timezone'
+
+module TZInfo
+
+  class LinkedTimezone < InfoTimezone #:nodoc:
+    # Returns the TimezonePeriod for the given UTC time. utc can either be
+    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
+    # information in utc is ignored (it is treated as a UTC time).        
+    #
+    # If no TimezonePeriod could be found, PeriodNotFound is raised.
+    def period_for_utc(utc)
+      @linked_timezone.period_for_utc(utc)
+    end
+    
+    # Returns the set of TimezonePeriod instances that are valid for the given
+    # local time as an array. If you just want a single period, use 
+    # period_for_local instead and specify how abiguities should be resolved.
+    # Raises PeriodNotFound if no periods are found for the given time.
+    def periods_for_local(local)
+      @linked_timezone.periods_for_local(local)
+    end
+    
+    protected
+      def setup(info)
+        super(info)
+        @linked_timezone = Timezone.get(info.link_to_identifier)
+      end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone_info.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone_info.rb
new file mode 100644
index 00000000..8197ff3e
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone_info.rb
@@ -0,0 +1,44 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'tzinfo/timezone_info'
+
+module TZInfo
+  # Represents a linked timezone defined in a data module.
+  class LinkedTimezoneInfo < TimezoneInfo #:nodoc:
+        
+    # The zone that provides the data (that this zone is an alias for).
+    attr_reader :link_to_identifier
+    
+    # Constructs a new TimezoneInfo with an identifier and the identifier
+    # of the zone linked to.
+    def initialize(identifier, link_to_identifier)
+      super(identifier)
+      @link_to_identifier = link_to_identifier      
+    end
+    
+    # Returns internal object state as a programmer-readable string.
+    def inspect
+      "#<#{self.class}: #@identifier,#@link_to_identifier>"
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/offset_rationals.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/offset_rationals.rb
new file mode 100644
index 00000000..c79eedb7
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/offset_rationals.rb
@@ -0,0 +1,95 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+module TZInfo
+  
+  # Provides a method for getting Rationals for a timezone offset in seconds.
+  # Pre-reduced rationals are returned for all the half-hour intervals between
+  # -14 and +14 hours to avoid having to call gcd at runtime.  
+  module OffsetRationals #:nodoc:
+    @@rational_cache = {
+      -50400 => Rational.send(:new!, -7,12), 
+      -48600 => Rational.send(:new!, -9,16),
+      -46800 => Rational.send(:new!, -13,24),
+      -45000 => Rational.send(:new!, -25,48),
+      -43200 => Rational.send(:new!, -1,2),
+      -41400 => Rational.send(:new!, -23,48),
+      -39600 => Rational.send(:new!, -11,24),
+      -37800 => Rational.send(:new!, -7,16),
+      -36000 => Rational.send(:new!, -5,12),
+      -34200 => Rational.send(:new!, -19,48),
+      -32400 => Rational.send(:new!, -3,8),
+      -30600 => Rational.send(:new!, -17,48),
+      -28800 => Rational.send(:new!, -1,3),
+      -27000 => Rational.send(:new!, -5,16),
+      -25200 => Rational.send(:new!, -7,24),
+      -23400 => Rational.send(:new!, -13,48),
+      -21600 => Rational.send(:new!, -1,4),
+      -19800 => Rational.send(:new!, -11,48),
+      -18000 => Rational.send(:new!, -5,24),
+      -16200 => Rational.send(:new!, -3,16),
+      -14400 => Rational.send(:new!, -1,6),
+      -12600 => Rational.send(:new!, -7,48),
+      -10800 => Rational.send(:new!, -1,8),
+       -9000 => Rational.send(:new!, -5,48),
+       -7200 => Rational.send(:new!, -1,12),
+       -5400 => Rational.send(:new!, -1,16),
+       -3600 => Rational.send(:new!, -1,24),
+       -1800 => Rational.send(:new!, -1,48),
+           0 => Rational.send(:new!, 0,1),
+        1800 => Rational.send(:new!, 1,48),
+        3600 => Rational.send(:new!, 1,24),
+        5400 => Rational.send(:new!, 1,16),
+        7200 => Rational.send(:new!, 1,12),
+        9000 => Rational.send(:new!, 5,48),
+       10800 => Rational.send(:new!, 1,8),
+       12600 => Rational.send(:new!, 7,48),
+       14400 => Rational.send(:new!, 1,6),
+       16200 => Rational.send(:new!, 3,16),
+       18000 => Rational.send(:new!, 5,24),
+       19800 => Rational.send(:new!, 11,48),
+       21600 => Rational.send(:new!, 1,4),
+       23400 => Rational.send(:new!, 13,48),
+       25200 => Rational.send(:new!, 7,24),
+       27000 => Rational.send(:new!, 5,16),
+       28800 => Rational.send(:new!, 1,3),
+       30600 => Rational.send(:new!, 17,48),
+       32400 => Rational.send(:new!, 3,8),
+       34200 => Rational.send(:new!, 19,48),
+       36000 => Rational.send(:new!, 5,12),
+       37800 => Rational.send(:new!, 7,16),
+       39600 => Rational.send(:new!, 11,24),
+       41400 => Rational.send(:new!, 23,48),
+       43200 => Rational.send(:new!, 1,2),
+       45000 => Rational.send(:new!, 25,48),
+       46800 => Rational.send(:new!, 13,24),  
+       48600 => Rational.send(:new!, 9,16),            
+       50400 => Rational.send(:new!, 7,12)}
+    
+    # Returns a Rational expressing the fraction of a day that offset in 
+    # seconds represents (i.e. equivalent to Rational(offset, 86400)). 
+    def rational_for_offset(offset)
+      @@rational_cache[offset] || Rational(offset, 86400)      
+    end
+    module_function :rational_for_offset
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/time_or_datetime.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/time_or_datetime.rb
new file mode 100644
index 00000000..264517f3
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/time_or_datetime.rb
@@ -0,0 +1,292 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'date'
+require 'time'
+require 'tzinfo/offset_rationals'
+
+module TZInfo
+  # Used by TZInfo internally to represent either a Time, DateTime or integer
+  # timestamp (seconds since 1970-01-01 00:00:00).
+  class TimeOrDateTime #:nodoc:
+    include Comparable
+    
+    # Constructs a new TimeOrDateTime. timeOrDateTime can be a Time, DateTime
+    # or an integer. If using a Time or DateTime, any time zone information is 
+    # ignored.
+    def initialize(timeOrDateTime)
+      @time = nil
+      @datetime = nil
+      @timestamp = nil
+      
+      if timeOrDateTime.is_a?(Time)
+        @time = timeOrDateTime        
+        @time = Time.utc(@time.year, @time.mon, @time.mday, @time.hour, @time.min, @time.sec) unless @time.zone == 'UTC'        
+        @orig = @time
+      elsif timeOrDateTime.is_a?(DateTime)
+        @datetime = timeOrDateTime
+        @datetime = @datetime.new_offset(0) unless @datetime.offset == 0
+        @orig = @datetime
+      else
+        @timestamp = timeOrDateTime.to_i
+        @orig = @timestamp
+      end
+    end
+    
+    # Returns the time as a Time.
+    def to_time
+      unless @time        
+        if @timestamp 
+          @time = Time.at(@timestamp).utc
+        else
+          @time = Time.utc(year, mon, mday, hour, min, sec)
+        end
+      end
+      
+      @time      
+    end
+    
+    # Returns the time as a DateTime.
+    def to_datetime
+      unless @datetime
+        @datetime = DateTime.new(year, mon, mday, hour, min, sec)
+      end
+      
+      @datetime
+    end
+    
+    # Returns the time as an integer timestamp.
+    def to_i
+      unless @timestamp
+        @timestamp = to_time.to_i
+      end
+      
+      @timestamp
+    end
+    
+    # Returns the time as the original time passed to new.
+    def to_orig
+      @orig
+    end
+    
+    # Returns a string representation of the TimeOrDateTime.
+    def to_s
+      if @orig.is_a?(Time)
+        "Time: #{@orig.to_s}"
+      elsif @orig.is_a?(DateTime)
+        "DateTime: #{@orig.to_s}"
+      else
+        "Timestamp: #{@orig.to_s}"
+      end
+    end
+    
+    # Returns internal object state as a programmer-readable string.
+    def inspect
+      "#<#{self.class}: #{@orig.inspect}>"
+    end
+    
+    # Returns the year.
+    def year
+      if @time
+        @time.year
+      elsif @datetime
+        @datetime.year
+      else
+        to_time.year
+      end
+    end
+    
+    # Returns the month of the year (1..12).
+    def mon
+      if @time
+        @time.mon
+      elsif @datetime
+        @datetime.mon
+      else
+        to_time.mon
+      end
+    end
+    alias :month :mon
+    
+    # Returns the day of the month (1..n).
+    def mday
+      if @time
+        @time.mday
+      elsif @datetime
+        @datetime.mday
+      else
+        to_time.mday
+      end
+    end
+    alias :day :mday
+    
+    # Returns the hour of the day (0..23).
+    def hour
+      if @time
+        @time.hour
+      elsif @datetime
+        @datetime.hour
+      else
+        to_time.hour
+      end
+    end
+    
+    # Returns the minute of the hour (0..59).
+    def min
+      if @time
+        @time.min
+      elsif @datetime
+        @datetime.min
+      else
+        to_time.min
+      end
+    end
+    
+    # Returns the second of the minute (0..60). (60 for a leap second).
+    def sec
+      if @time
+        @time.sec
+      elsif @datetime
+        @datetime.sec
+      else
+        to_time.sec
+      end
+    end
+    
+    # Compares this TimeOrDateTime with another Time, DateTime, integer
+    # timestamp or TimeOrDateTime. Returns -1, 0 or +1 depending whether the 
+    # receiver is less than, equal to, or greater than timeOrDateTime.
+    #
+    # Milliseconds and smaller units are ignored in the comparison.
+    def <=>(timeOrDateTime)
+      if timeOrDateTime.is_a?(TimeOrDateTime)            
+        orig = timeOrDateTime.to_orig
+        
+        if @orig.is_a?(DateTime) || orig.is_a?(DateTime)
+          # If either is a DateTime, assume it is there for a reason 
+          # (i.e. for range).
+          to_datetime <=> timeOrDateTime.to_datetime
+        elsif orig.is_a?(Time)
+          to_time <=> timeOrDateTime.to_time
+        else
+          to_i <=> timeOrDateTime.to_i
+        end        
+      elsif @orig.is_a?(DateTime) || timeOrDateTime.is_a?(DateTime)
+        # If either is a DateTime, assume it is there for a reason 
+        # (i.e. for range).        
+        to_datetime <=> TimeOrDateTime.wrap(timeOrDateTime).to_datetime
+      elsif timeOrDateTime.is_a?(Time)
+        to_time <=> timeOrDateTime
+      else
+        to_i <=> timeOrDateTime.to_i
+      end
+    end
+    
+    # Adds a number of seconds to the TimeOrDateTime. Returns a new 
+    # TimeOrDateTime, preserving what the original constructed type was.
+    # If the original type is a Time and the resulting calculation goes out of
+    # range for Times, then an exception will be raised by the Time class.
+    def +(seconds)
+      if seconds == 0
+        self
+      else
+        if @orig.is_a?(DateTime)
+          TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds))
+        else
+          # + defined for Time and integer timestamps
+          TimeOrDateTime.new(@orig + seconds)
+        end
+      end
+    end
+    
+    # Subtracts a number of seconds from the TimeOrDateTime. Returns a new 
+    # TimeOrDateTime, preserving what the original constructed type was.
+    # If the original type is a Time and the resulting calculation goes out of
+    # range for Times, then an exception will be raised by the Time class.
+    def -(seconds)
+      self + (-seconds)
+    end
+   
+    # Similar to the + operator, but for cases where adding would cause a 
+    # timestamp or time to go out of the allowed range, converts to a DateTime
+    # based TimeOrDateTime.
+    def add_with_convert(seconds)
+      if seconds == 0
+        self
+      else
+        if @orig.is_a?(DateTime)
+          TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds))
+        else
+          # A Time or timestamp.
+          result = to_i + seconds
+          
+          if result < 0 || result > 2147483647
+            result = TimeOrDateTime.new(to_datetime + OffsetRationals.rational_for_offset(seconds))
+          else
+            result = TimeOrDateTime.new(@orig + seconds)
+          end
+        end
+      end
+    end
+    
+    # Returns true if todt represents the same time and was originally 
+    # constructed with the same type (DateTime, Time or timestamp) as this 
+    # TimeOrDateTime.
+    def eql?(todt)
+      todt.respond_to?(:to_orig) && to_orig.eql?(todt.to_orig)      
+    end
+    
+    # Returns a hash of this TimeOrDateTime.
+    def hash
+      @orig.hash
+    end
+    
+    # If no block is given, returns a TimeOrDateTime wrapping the given 
+    # timeOrDateTime. If a block is specified, a TimeOrDateTime is constructed
+    # and passed to the block. The result of the block must be a TimeOrDateTime.
+    # to_orig will be called on the result and the result of to_orig will be
+    # returned.
+    #
+    # timeOrDateTime can be a Time, DateTime, integer timestamp or TimeOrDateTime.
+    # If a TimeOrDateTime is passed in, no new TimeOrDateTime will be constructed,
+    # the passed in value will be used.
+    def self.wrap(timeOrDateTime)      
+      t = timeOrDateTime.is_a?(TimeOrDateTime) ? timeOrDateTime : TimeOrDateTime.new(timeOrDateTime)        
+      
+      if block_given?
+        t = yield t
+        
+        if timeOrDateTime.is_a?(TimeOrDateTime)
+          t          
+        elsif timeOrDateTime.is_a?(Time)
+          t.to_time
+        elsif timeOrDateTime.is_a?(DateTime)
+          t.to_datetime
+        else
+          t.to_i
+        end        
+      else
+        t
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb
new file mode 100644
index 00000000..f87fb6fb
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb
@@ -0,0 +1,508 @@
+#--
+# Copyright (c) 2005-2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'date'
+# require 'tzinfo/country'
+require 'tzinfo/time_or_datetime'
+require 'tzinfo/timezone_period'
+
+module TZInfo
+  # Indicate a specified time in a local timezone has more than one
+  # possible time in UTC. This happens when switching from daylight savings time 
+  # to normal time where the clocks are rolled back. Thrown by period_for_local
+  # and local_to_utc when using an ambiguous time and not specifying any 
+  # means to resolve the ambiguity.
+  class AmbiguousTime < StandardError
+  end
+  
+  # Thrown to indicate that no TimezonePeriod matching a given time could be found.
+  class PeriodNotFound < StandardError
+  end
+  
+  # Thrown by Timezone#get if the identifier given is not valid.
+  class InvalidTimezoneIdentifier < StandardError
+  end
+  
+  # Thrown if an attempt is made to use a timezone created with Timezone.new(nil).
+  class UnknownTimezone < StandardError
+  end
+  
+  # Timezone is the base class of all timezones. It provides a factory method
+  # get to access timezones by identifier. Once a specific Timezone has been
+  # retrieved, DateTimes, Times and timestamps can be converted between the UTC 
+  # and the local time for the zone. For example:
+  #
+  #   tz = TZInfo::Timezone.get('America/New_York')
+  #   puts tz.utc_to_local(DateTime.new(2005,8,29,15,35,0)).to_s
+  #   puts tz.local_to_utc(Time.utc(2005,8,29,11,35,0)).to_s
+  #   puts tz.utc_to_local(1125315300).to_s
+  #
+  # Each time conversion method returns an object of the same type it was 
+  # passed.
+  #
+  # The timezone information all comes from the tz database
+  # (see http://www.twinsun.com/tz/tz-link.htm)
+  class Timezone
+    include Comparable
+    
+    # Cache of loaded zones by identifier to avoid using require if a zone
+    # has already been loaded.
+    @@loaded_zones = {}
+    
+    # Whether the timezones index has been loaded yet.
+    @@index_loaded = false
+    
+    # Returns a timezone by its identifier (e.g. "Europe/London", 
+    # "America/Chicago" or "UTC").
+    #
+    # Raises InvalidTimezoneIdentifier if the timezone couldn't be found.
+    def self.get(identifier)
+      instance = @@loaded_zones[identifier]
+      unless instance  
+        raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /^[A-z0-9\+\-_]+(\/[A-z0-9\+\-_]+)*$/
+        identifier = identifier.gsub(/-/, '__m__').gsub(/\+/, '__p__')
+        begin
+          # Use a temporary variable to avoid an rdoc warning
+          file = "tzinfo/definitions/#{identifier}"
+          require file
+          
+          m = Definitions
+          identifier.split(/\//).each {|part|
+            m = m.const_get(part)
+          }
+          
+          info = m.get
+          
+          # Could make Timezone subclasses register an interest in an info
+          # type. Since there are currently only two however, there isn't
+          # much point.
+          if info.kind_of?(DataTimezoneInfo)
+            instance = DataTimezone.new(info)
+          elsif info.kind_of?(LinkedTimezoneInfo)
+            instance = LinkedTimezone.new(info)
+          else
+            raise InvalidTimezoneIdentifier, "No handler for info type #{info.class}"
+          end
+          
+          @@loaded_zones[instance.identifier] = instance         
+        rescue LoadError, NameError => e
+          raise InvalidTimezoneIdentifier, e.message
+        end
+      end
+      
+      instance
+    end
+    
+    # Returns a proxy for the Timezone with the given identifier. The proxy
+    # will cause the real timezone to be loaded when an attempt is made to 
+    # find a period or convert a time. get_proxy will not validate the 
+    # identifier. If an invalid identifier is specified, no exception will be 
+    # raised until the proxy is used. 
+    def self.get_proxy(identifier)
+      TimezoneProxy.new(identifier)
+    end
+    
+    # If identifier is nil calls super(), otherwise calls get. An identfier 
+    # should always be passed in when called externally.
+    def self.new(identifier = nil)
+      if identifier        
+        get(identifier)
+      else
+        super()
+      end
+    end
+    
+    # Returns an array containing all the available Timezones.
+    #
+    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
+    # definitions until a conversion is actually required.
+    def self.all
+      get_proxies(all_identifiers)
+    end
+    
+    # Returns an array containing the identifiers of all the available 
+    # Timezones.
+    def self.all_identifiers
+      load_index
+      Indexes::Timezones.timezones
+    end
+    
+    # Returns an array containing all the available Timezones that are based
+    # on data (are not links to other Timezones).
+    #
+    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
+    # definitions until a conversion is actually required.
+    def self.all_data_zones
+      get_proxies(all_data_zone_identifiers)
+    end
+    
+    # Returns an array containing the identifiers of all the available 
+    # Timezones that are based on data (are not links to other Timezones)..
+    def self.all_data_zone_identifiers
+      load_index
+      Indexes::Timezones.data_timezones
+    end
+    
+    # Returns an array containing all the available Timezones that are links
+    # to other Timezones.
+    #
+    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
+    # definitions until a conversion is actually required.
+    def self.all_linked_zones
+      get_proxies(all_linked_zone_identifiers)      
+    end
+    
+    # Returns an array containing the identifiers of all the available 
+    # Timezones that are links to other Timezones.
+    def self.all_linked_zone_identifiers
+      load_index
+      Indexes::Timezones.linked_timezones
+    end
+    
+    # Returns all the Timezones defined for all Countries. This is not the
+    # complete set of Timezones as some are not country specific (e.g. 
+    # 'Etc/GMT').
+    # 
+    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
+    # definitions until a conversion is actually required.        
+    def self.all_country_zones
+      Country.all_codes.inject([]) {|zones,country|
+        zones += Country.get(country).zones
+      }
+    end
+    
+    # Returns all the zone identifiers defined for all Countries. This is not the
+    # complete set of zone identifiers as some are not country specific (e.g. 
+    # 'Etc/GMT'). You can obtain a Timezone instance for a given identifier
+    # with the get method.
+    def self.all_country_zone_identifiers
+      Country.all_codes.inject([]) {|zones,country|
+        zones += Country.get(country).zone_identifiers
+      }
+    end
+    
+    # Returns all US Timezone instances. A shortcut for 
+    # TZInfo::Country.get('US').zones.
+    #
+    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
+    # definitions until a conversion is actually required.
+    def self.us_zones
+      Country.get('US').zones
+    end
+    
+    # Returns all US zone identifiers. A shortcut for 
+    # TZInfo::Country.get('US').zone_identifiers.
+    def self.us_zone_identifiers
+      Country.get('US').zone_identifiers
+    end
+    
+    # The identifier of the timezone, e.g. "Europe/Paris".
+    def identifier
+      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
+    end
+    
+    # An alias for identifier.
+    def name
+      # Don't use alias, as identifier gets overridden.
+      identifier
+    end
+    
+    # Returns a friendlier version of the identifier.
+    def to_s
+      friendly_identifier
+    end
+    
+    # Returns internal object state as a programmer-readable string.
+    def inspect
+      "#<#{self.class}: #{identifier}>"
+    end
+    
+    # Returns a friendlier version of the identifier. Set skip_first_part to 
+    # omit the first part of the identifier (typically a region name) where
+    # there is more than one part.
+    #
+    # For example:
+    #
+    #   Timezone.get('Europe/Paris').friendly_identifier(false)          #=> "Europe - Paris"
+    #   Timezone.get('Europe/Paris').friendly_identifier(true)           #=> "Paris"
+    #   Timezone.get('America/Indiana/Knox').friendly_identifier(false)  #=> "America - Knox, Indiana"
+    #   Timezone.get('America/Indiana/Knox').friendly_identifier(true)   #=> "Knox, Indiana"           
+    def friendly_identifier(skip_first_part = false)
+      parts = identifier.split('/')
+      if parts.empty?
+        # shouldn't happen
+        identifier
+      elsif parts.length == 1        
+        parts[0]
+      else
+        if skip_first_part
+          result = ''
+        else
+          result = parts[0] + ' - '
+        end
+        
+        parts[1, parts.length - 1].reverse_each {|part|
+          part.gsub!(/_/, ' ')
+          
+          if part.index(/[a-z]/)
+            # Missing a space if a lower case followed by an upper case and the
+            # name isn't McXxxx.
+            part.gsub!(/([^M][a-z])([A-Z])/, '\1 \2')
+            part.gsub!(/([M][a-bd-z])([A-Z])/, '\1 \2')
+            
+            # Missing an apostrophe if two consecutive upper case characters.
+            part.gsub!(/([A-Z])([A-Z])/, '\1\'\2')
+          end
+          
+          result << part
+          result << ', '
+        }
+        
+        result.slice!(result.length - 2, 2)
+        result
+      end
+    end
+    
+    # Returns the TimezonePeriod for the given UTC time. utc can either be
+    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
+    # information in utc is ignored (it is treated as a UTC time).        
+    def period_for_utc(utc)            
+      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'      
+    end
+    
+    # Returns the set of TimezonePeriod instances that are valid for the given
+    # local time as an array. If you just want a single period, use 
+    # period_for_local instead and specify how ambiguities should be resolved.
+    # Returns an empty array if no periods are found for the given time.
+    def periods_for_local(local)
+      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
+    end
+    
+    # Returns the TimezonePeriod for the given local time. local can either be
+    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
+    # information in local is ignored (it is treated as a time in the current 
+    # timezone).
+    #
+    # Warning: There are local times that have no equivalent UTC times (e.g.
+    # in the transition from standard time to daylight savings time). There are
+    # also local times that have more than one UTC equivalent (e.g. in the
+    # transition from daylight savings time to standard time).
+    #
+    # In the first case (no equivalent UTC time), a PeriodNotFound exception
+    # will be raised.
+    #
+    # In the second case (more than one equivalent UTC time), an AmbiguousTime
+    # exception will be raised unless the optional dst parameter or block
+    # handles the ambiguity. 
+    #
+    # If the ambiguity is due to a transition from daylight savings time to
+    # standard time, the dst parameter can be used to select whether the 
+    # daylight savings time or local time is used. For example,
+    #
+    #   Timezone.get('America/New_York').period_for_local(DateTime.new(2004,10,31,1,30,0))
+    #
+    # would raise an AmbiguousTime exception.
+    #
+    # Specifying dst=true would the daylight savings period from April to 
+    # October 2004. Specifying dst=false would return the standard period
+    # from October 2004 to April 2005.
+    #
+    # If the dst parameter does not resolve the ambiguity, and a block is 
+    # specified, it is called. The block must take a single parameter - an
+    # array of the periods that need to be resolved. The block can select and
+    # return a single period or return nil or an empty array
+    # to cause an AmbiguousTime exception to be raised.
+    def period_for_local(local, dst = nil)            
+      results = periods_for_local(local)
+      
+      if results.empty?
+        raise PeriodNotFound
+      elsif results.size < 2
+        results.first
+      else
+        # ambiguous result try to resolve
+        
+        if !dst.nil?
+          matches = results.find_all {|period| period.dst? == dst}
+          results = matches if !matches.empty?            
+        end
+        
+        if results.size < 2
+          results.first
+        else
+          # still ambiguous, try the block
+                    
+          if block_given?
+            results = yield results
+          end
+          
+          if results.is_a?(TimezonePeriod)
+            results
+          elsif results && results.size == 1
+            results.first
+          else          
+            raise AmbiguousTime, "#{local} is an ambiguous local time."
+          end
+        end
+      end      
+    end
+    
+    # Converts a time in UTC to the local timezone. utc can either be
+    # a DateTime, Time or timestamp (Time.to_i). The returned time has the same
+    # type as utc. Any timezone information in utc is ignored (it is treated as 
+    # a UTC time).
+    def utc_to_local(utc)
+      TimeOrDateTime.wrap(utc) {|wrapped|
+        period_for_utc(wrapped).to_local(wrapped)
+      }
+    end
+    
+    # Converts a time in the local timezone to UTC. local can either be
+    # a DateTime, Time or timestamp (Time.to_i). The returned time has the same
+    # type as local. Any timezone information in local is ignored (it is treated
+    # as a local time).
+    #
+    # Warning: There are local times that have no equivalent UTC times (e.g.
+    # in the transition from standard time to daylight savings time). There are
+    # also local times that have more than one UTC equivalent (e.g. in the
+    # transition from daylight savings time to standard time).
+    #
+    # In the first case (no equivalent UTC time), a PeriodNotFound exception
+    # will be raised.
+    #
+    # In the second case (more than one equivalent UTC time), an AmbiguousTime
+    # exception will be raised unless the optional dst parameter or block
+    # handles the ambiguity. 
+    #
+    # If the ambiguity is due to a transition from daylight savings time to
+    # standard time, the dst parameter can be used to select whether the 
+    # daylight savings time or local time is used. For example,
+    #
+    #   Timezone.get('America/New_York').local_to_utc(DateTime.new(2004,10,31,1,30,0))
+    #
+    # would raise an AmbiguousTime exception.
+    #
+    # Specifying dst=true would return 2004-10-31 5:30:00. Specifying dst=false
+    # would return 2004-10-31 6:30:00.
+    #
+    # If the dst parameter does not resolve the ambiguity, and a block is 
+    # specified, it is called. The block must take a single parameter - an
+    # array of the periods that need to be resolved. The block can return a
+    # single period to use to convert the time or return nil or an empty array
+    # to cause an AmbiguousTime exception to be raised.
+    def local_to_utc(local, dst = nil)
+      TimeOrDateTime.wrap(local) {|wrapped|
+        if block_given?
+          period = period_for_local(wrapped, dst) {|periods| yield periods }
+        else
+          period = period_for_local(wrapped, dst)
+        end
+        
+        period.to_utc(wrapped)
+      }
+    end
+    
+    # Returns the current time in the timezone as a Time.
+    def now
+      utc_to_local(Time.now.utc)
+    end
+    
+    # Returns the TimezonePeriod for the current time. 
+    def current_period
+      period_for_utc(Time.now.utc)
+    end
+    
+    # Returns the current Time and TimezonePeriod as an array. The first element
+    # is the time, the second element is the period.
+    def current_period_and_time
+      utc = Time.now.utc
+      period = period_for_utc(utc)
+      [period.to_local(utc), period]
+    end
+    
+    alias :current_time_and_period :current_period_and_time
+
+    # Converts a time in UTC to local time and returns it as a string 
+    # according to the given format. The formatting is identical to 
+    # Time.strftime and DateTime.strftime, except %Z is replaced with the
+    # timezone abbreviation for the specified time (for example, EST or EDT).        
+    def strftime(format, utc = Time.now.utc)      
+      period = period_for_utc(utc)
+      local = period.to_local(utc)      
+      local = Time.at(local).utc unless local.kind_of?(Time) || local.kind_of?(DateTime)
+      abbreviation = period.abbreviation.to_s.gsub(/%/, '%%')
+      
+      format = format.gsub(/(.?)%Z/) do
+        if $1 == '%'
+          # return %%Z so the real strftime treats it as a literal %Z too
+          '%%Z'
+        else
+          "#$1#{abbreviation}"
+        end
+      end
+      
+      local.strftime(format)
+    end
+    
+    # Compares two Timezones based on their identifier. Returns -1 if tz is less
+    # than self, 0 if tz is equal to self and +1 if tz is greater than self.
+    def <=>(tz)
+      identifier <=> tz.identifier
+    end
+    
+    # Returns true if and only if the identifier of tz is equal to the 
+    # identifier of this Timezone.
+    def eql?(tz)
+      self == tz
+    end
+    
+    # Returns a hash of this Timezone.
+    def hash
+      identifier.hash
+    end
+    
+    # Dumps this Timezone for marshalling.
+    def _dump(limit)
+      identifier
+    end
+    
+    # Loads a marshalled Timezone.
+    def self._load(data)
+      Timezone.get(data)
+    end
+    
+    private
+      # Loads in the index of timezones if it hasn't already been loaded.
+      def self.load_index
+        unless @@index_loaded
+          require 'tzinfo/indexes/timezones'
+          @@index_loaded = true
+        end        
+      end
+      
+      # Returns an array of proxies corresponding to the given array of 
+      # identifiers.
+      def self.get_proxies(identifiers)
+        identifiers.collect {|identifier| get_proxy(identifier)}
+      end
+  end        
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_definition.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_definition.rb
new file mode 100644
index 00000000..39ca8bfa
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_definition.rb
@@ -0,0 +1,56 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'tzinfo/data_timezone_info'
+require 'tzinfo/linked_timezone_info'
+
+module TZInfo
+  
+  # TimezoneDefinition is included into Timezone definition modules.
+  # TimezoneDefinition provides the methods for defining timezones.
+  module TimezoneDefinition #:nodoc:
+    # Add class methods to the includee.
+    def self.append_features(base)
+      super
+      base.extend(ClassMethods)
+    end
+    
+    # Class methods for inclusion.
+    module ClassMethods #:nodoc:
+      # Returns and yields a DataTimezoneInfo object to define a timezone.
+      def timezone(identifier)
+        yield @timezone = DataTimezoneInfo.new(identifier)
+      end
+      
+      # Defines a linked timezone.
+      def linked_timezone(identifier, link_to_identifier)
+        @timezone = LinkedTimezoneInfo.new(identifier, link_to_identifier)
+      end
+      
+      # Returns the last TimezoneInfo to be defined with timezone or 
+      # linked_timezone.
+      def get
+        @timezone
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_info.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_info.rb
new file mode 100644
index 00000000..68e38c35
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_info.rb
@@ -0,0 +1,40 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+module TZInfo
+  # Represents a timezone defined in a data module.
+  class TimezoneInfo #:nodoc:
+    
+    # The timezone identifier.
+    attr_reader :identifier
+    
+    # Constructs a new TimezoneInfo with an identifier.
+    def initialize(identifier)
+      @identifier = identifier
+    end
+    
+    # Returns internal object state as a programmer-readable string.
+    def inspect
+      "#<#{self.class}: #@identifier>"
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_offset_info.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_offset_info.rb
new file mode 100644
index 00000000..6a0bbca4
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_offset_info.rb
@@ -0,0 +1,94 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+module TZInfo
+  # Represents an offset defined in a Timezone data file.
+  class TimezoneOffsetInfo #:nodoc:
+    # The base offset of the timezone from UTC in seconds.
+    attr_reader :utc_offset
+    
+    # The offset from standard time for the zone in seconds (i.e. non-zero if 
+    # daylight savings is being observed).
+    attr_reader :std_offset
+    
+    # The total offset of this observance from UTC in seconds 
+    # (utc_offset + std_offset).
+    attr_reader :utc_total_offset
+    
+    # The abbreviation that identifies this observance, e.g. "GMT" 
+    # (Greenwich Mean Time) or "BST" (British Summer Time) for "Europe/London". The returned identifier is a 
+    # symbol.
+    attr_reader :abbreviation
+    
+    # Constructs a new TimezoneOffsetInfo. utc_offset and std_offset are
+    # specified in seconds.
+    def initialize(utc_offset, std_offset, abbreviation)
+      @utc_offset = utc_offset
+      @std_offset = std_offset      
+      @abbreviation = abbreviation
+      
+      @utc_total_offset = @utc_offset + @std_offset
+    end
+    
+    # True if std_offset is non-zero.
+    def dst?
+      @std_offset != 0
+    end
+    
+    # Converts a UTC DateTime to local time based on the offset of this period.
+    def to_local(utc)
+      TimeOrDateTime.wrap(utc) {|wrapped|
+        wrapped + @utc_total_offset
+      }
+    end
+    
+    # Converts a local DateTime to UTC based on the offset of this period.
+    def to_utc(local)
+      TimeOrDateTime.wrap(local) {|wrapped|
+        wrapped - @utc_total_offset
+      }
+    end
+    
+    # Returns true if and only if toi has the same utc_offset, std_offset
+    # and abbreviation as this TimezoneOffsetInfo.
+    def ==(toi)
+      toi.respond_to?(:utc_offset) && toi.respond_to?(:std_offset) && toi.respond_to?(:abbreviation) &&
+        utc_offset == toi.utc_offset && std_offset == toi.std_offset && abbreviation == toi.abbreviation
+    end
+    
+    # Returns true if and only if toi has the same utc_offset, std_offset
+    # and abbreviation as this TimezoneOffsetInfo.
+    def eql?(toi)
+      self == toi
+    end
+    
+    # Returns a hash of this TimezoneOffsetInfo.
+    def hash
+      utc_offset.hash ^ std_offset.hash ^ abbreviation.hash
+    end
+    
+    # Returns internal object state as a programmer-readable string.
+    def inspect
+      "#<#{self.class}: #@utc_offset,#@std_offset,#@abbreviation>"
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_period.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_period.rb
new file mode 100644
index 00000000..00888fcf
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_period.rb
@@ -0,0 +1,198 @@
+#--
+# Copyright (c) 2005-2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'tzinfo/offset_rationals'
+require 'tzinfo/time_or_datetime'
+
+module TZInfo
+  # A period of time in a timezone where the same offset from UTC applies.
+  #
+  # All the methods that take times accept instances of Time, DateTime or
+  # integer timestamps.
+  class TimezonePeriod
+    # The TimezoneTransitionInfo that defines the start of this TimezonePeriod 
+    # (may be nil if unbounded).
+    attr_reader :start_transition
+    
+    # The TimezoneTransitionInfo that defines the end of this TimezonePeriod
+    # (may be nil if unbounded).
+    attr_reader :end_transition
+    
+    # The TimezoneOffsetInfo for this period.
+    attr_reader :offset    
+    
+    # Initializes a new TimezonePeriod.
+    def initialize(start_transition, end_transition, offset = nil)
+      @start_transition = start_transition
+      @end_transition = end_transition
+      
+      if offset
+        raise ArgumentError, 'Offset specified with transitions' if @start_transition || @end_transition
+        @offset = offset
+      else
+        if @start_transition 
+          @offset = @start_transition.offset
+        elsif @end_transition
+          @offset = @end_transition.previous_offset
+        else
+          raise ArgumentError, 'No offset specified and no transitions to determine it from'
+        end
+      end
+      
+      @utc_total_offset_rational = nil      
+    end
+            
+    # Base offset of the timezone from UTC (seconds).
+    def utc_offset
+      @offset.utc_offset
+    end
+    
+    # Offset from the local time where daylight savings is in effect (seconds).
+    # E.g.: utc_offset could be -5 hours. Normally, std_offset would be 0. 
+    # During daylight savings, std_offset would typically become +1 hours.
+    def std_offset
+      @offset.std_offset
+    end
+    
+    # The identifier of this period, e.g. "GMT" (Greenwich Mean Time) or "BST"
+    # (British Summer Time) for "Europe/London". The returned identifier is a 
+    # symbol.
+    def abbreviation
+      @offset.abbreviation
+    end
+    alias :zone_identifier :abbreviation
+    
+    # Total offset from UTC (seconds). Equal to utc_offset + std_offset.
+    def utc_total_offset
+      @offset.utc_total_offset
+    end
+    
+    # Total offset from UTC (days). Result is a Rational.
+    def utc_total_offset_rational
+      unless @utc_total_offset_rational
+        @utc_total_offset_rational = OffsetRationals.rational_for_offset(utc_total_offset) 
+      end
+      @utc_total_offset_rational
+    end
+    
+    # The start time of the period in UTC as a DateTime. May be nil if unbounded.
+    def utc_start
+      @start_transition ? @start_transition.at.to_datetime : nil
+    end
+    
+    # The end time of the period in UTC as a DateTime. May be nil if unbounded.
+    def utc_end
+      @end_transition ? @end_transition.at.to_datetime : nil
+    end
+    
+    # The start time of the period in local time as a DateTime. May be nil if 
+    # unbounded.
+    def local_start
+      @start_transition ? @start_transition.local_start.to_datetime : nil
+    end
+    
+    # The end time of the period in local time as a DateTime. May be nil if 
+    # unbounded.
+    def local_end
+      @end_transition ? @end_transition.local_end.to_datetime : nil
+    end
+    
+    # true if daylight savings is in effect for this period; otherwise false.
+    def dst?
+      @offset.dst?
+    end
+    
+    # true if this period is valid for the given UTC DateTime; otherwise false.
+    def valid_for_utc?(utc)
+      utc_after_start?(utc) && utc_before_end?(utc) 
+    end
+    
+    # true if the given UTC DateTime is after the start of the period 
+    # (inclusive); otherwise false.
+    def utc_after_start?(utc)
+      !@start_transition || @start_transition.at <= utc
+    end
+    
+    # true if the given UTC DateTime is before the end of the period 
+    # (exclusive); otherwise false.
+    def utc_before_end?(utc)
+      !@end_transition || @end_transition.at > utc
+    end
+    
+    # true if this period is valid for the given local DateTime; otherwise false.
+    def valid_for_local?(local)      
+      local_after_start?(local) && local_before_end?(local) 
+    end
+    
+    # true if the given local DateTime is after the start of the period 
+    # (inclusive); otherwise false.
+    def local_after_start?(local)
+      !@start_transition || @start_transition.local_start <= local
+    end
+    
+    # true if the given local DateTime is before the end of the period 
+    # (exclusive); otherwise false.
+    def local_before_end?(local)
+      !@end_transition || @end_transition.local_end > local
+    end
+    
+    # Converts a UTC DateTime to local time based on the offset of this period.
+    def to_local(utc)
+      @offset.to_local(utc)
+    end
+    
+    # Converts a local DateTime to UTC based on the offset of this period.
+    def to_utc(local)
+      @offset.to_utc(local)
+    end
+    
+    # Returns true if this TimezonePeriod is equal to p. This compares the 
+    # start_transition, end_transition and offset using ==.
+    def ==(p)
+      p.respond_to?(:start_transition) && p.respond_to?(:end_transition) &&
+        p.respond_to?(:offset) && start_transition == p.start_transition &&
+        end_transition == p.end_transition && offset == p.offset
+    end
+    
+    # Returns true if this TimezonePeriods is equal to p. This compares the
+    # start_transition, end_transition and offset using eql?
+    def eql?(p)
+      p.respond_to?(:start_transition) && p.respond_to?(:end_transition) &&
+        p.respond_to?(:offset) && start_transition.eql?(p.start_transition) &&
+        end_transition.eql?(p.end_transition) && offset.eql?(p.offset)
+    end
+    
+    # Returns a hash of this TimezonePeriod.
+    def hash
+      result = @start_transition.hash ^ @end_transition.hash
+      result ^= @offset.hash unless @start_transition || @end_transition
+      result       
+    end
+    
+    # Returns internal object state as a programmer-readable string.
+    def inspect
+      result = "#<#{self.class}: #{@start_transition.inspect},#{@end_transition.inspect}"
+      result << ",#{@offset.inspect}>" unless @start_transition || @end_transition
+      result + '>'
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_transition_info.rb b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_transition_info.rb
new file mode 100644
index 00000000..3fecb24f
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_transition_info.rb
@@ -0,0 +1,138 @@
+#--
+# Copyright (c) 2006 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'date'
+require 'tzinfo/time_or_datetime'
+
+module TZInfo
+  # Represents an offset defined in a Timezone data file.
+  class TimezoneTransitionInfo #:nodoc:
+    # The offset this transition changes to (a TimezoneOffsetInfo instance).
+    attr_reader :offset
+    
+    # The offset this transition changes from (a TimezoneOffsetInfo instance).
+    attr_reader :previous_offset
+    
+    # The numerator of the DateTime if the transition time is defined as a 
+    # DateTime, otherwise the transition time as a timestamp.
+    attr_reader :numerator_or_time
+    protected :numerator_or_time
+    
+    # Either the denominotor of the DateTime if the transition time is defined
+    # as a DateTime, otherwise nil. 
+    attr_reader :denominator
+    protected :denominator
+    
+    # Creates a new TimezoneTransitionInfo with the given offset, 
+    # previous_offset (both TimezoneOffsetInfo instances) and UTC time. 
+    # if denominator is nil, numerator_or_time is treated as a number of 
+    # seconds since the epoch. If denominator is specified numerator_or_time
+    # and denominator are used to create a DateTime as follows:
+    # 
+    #  DateTime.new!(Rational.send(:new!, numerator_or_time, denominator), 0, Date::ITALY)
+    #
+    # For performance reasons, the numerator and denominator must be specified
+    # in their lowest form.
+    def initialize(offset, previous_offset, numerator_or_time, denominator = nil)
+      @offset = offset
+      @previous_offset = previous_offset
+      @numerator_or_time = numerator_or_time
+      @denominator = denominator
+      
+      @at = nil
+      @local_end = nil
+      @local_start = nil
+    end
+    
+    # A TimeOrDateTime instance representing the UTC time when this transition
+    # occurs.
+    def at
+      unless @at
+        unless @denominator 
+          @at = TimeOrDateTime.new(@numerator_or_time)
+        else
+          r = Rational.send(:new!, @numerator_or_time, @denominator)
+          
+          # Ruby 1.8.6 introduced new! and deprecated new0.
+          # Ruby 1.9.0 removed new0.
+          # We still need to support new0 for older versions of Ruby.
+          if DateTime.respond_to? :new!
+            dt = DateTime.new!(r, 0, Date::ITALY)
+          else
+            dt = DateTime.new0(r, 0, Date::ITALY)
+          end
+          
+          @at = TimeOrDateTime.new(dt)
+        end
+      end
+      
+      @at
+    end
+    
+    # A TimeOrDateTime instance representing the local time when this transition
+    # causes the previous observance to end (calculated from at using 
+    # previous_offset).
+    def local_end
+      @local_end = at.add_with_convert(@previous_offset.utc_total_offset) unless @local_end      
+      @local_end
+    end
+    
+    # A TimeOrDateTime instance representing the local time when this transition
+    # causes the next observance to start (calculated from at using offset).
+    def local_start
+      @local_start = at.add_with_convert(@offset.utc_total_offset) unless @local_start
+      @local_start
+    end
+    
+    # Returns true if this TimezoneTransitionInfo is equal to the given
+    # TimezoneTransitionInfo. Two TimezoneTransitionInfo instances are 
+    # considered to be equal by == if offset, previous_offset and at are all 
+    # equal.
+    def ==(tti)
+      tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) && tti.respond_to?(:at) &&
+        offset == tti.offset && previous_offset == tti.previous_offset && at == tti.at
+    end
+    
+    # Returns true if this TimezoneTransitionInfo is equal to the given
+    # TimezoneTransitionInfo. Two TimezoneTransitionInfo instances are 
+    # considered to be equal by eql? if offset, previous_offset, 
+    # numerator_or_time and denominator are all equal. This is stronger than ==,
+    # which just requires the at times to be equal regardless of how they were
+    # originally specified.
+    def eql?(tti)
+      tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) &&
+        tti.respond_to?(:numerator_or_time) && tti.respond_to?(:denominator) &&
+        offset == tti.offset && previous_offset == tti.previous_offset &&
+        numerator_or_time == tti.numerator_or_time && denominator == tti.denominator        
+    end
+    
+    # Returns a hash of this TimezoneTransitionInfo instance.
+    def hash
+      @offset.hash ^ @previous_offset.hash ^ @numerator_or_time.hash ^ @denominator.hash
+    end
+    
+    # Returns internal object state as a programmer-readable string.
+    def inspect
+      "#<#{self.class}: #{at.inspect},#{@offset.inspect}>"      
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/version.rb b/vendor/rails/activesupport/lib/active_support/version.rb
index b346459a..34a4576a 100644
--- a/vendor/rails/activesupport/lib/active_support/version.rb
+++ b/vendor/rails/activesupport/lib/active_support/version.rb
@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/activesupport/test/caching_test.rb b/vendor/rails/activesupport/test/caching_test.rb
index 09b56525..f3220d27 100644
--- a/vendor/rails/activesupport/test/caching_test.rb
+++ b/vendor/rails/activesupport/test/caching_test.rb
@@ -1,5 +1,11 @@
 require 'abstract_unit'
 
+class CacheKeyTest < Test::Unit::TestCase
+  def test_expand_cache_key
+    assert_equal 'name/1/2/true', ActiveSupport::Cache.expand_cache_key([1, '2', true], :name)
+  end
+end
+
 class CacheStoreSettingTest < Test::Unit::TestCase
   def test_file_fragment_cache_store
     store = ActiveSupport::Cache.lookup_store :file_store, "/path/to/cache/directory"
diff --git a/vendor/rails/activesupport/test/core_ext/array_ext_test.rb b/vendor/rails/activesupport/test/core_ext/array_ext_test.rb
index ccab0f70..73fbeb8b 100644
--- a/vendor/rails/activesupport/test/core_ext/array_ext_test.rb
+++ b/vendor/rails/activesupport/test/core_ext/array_ext_test.rb
@@ -21,7 +21,7 @@ class ArrayExtToParamTests < Test::Unit::TestCase
       "#{self}1"
     end
   end
-  
+
   def test_string_array
     assert_equal '', %w().to_param
     assert_equal 'hello/world', %w(hello world).to_param
@@ -31,7 +31,7 @@ class ArrayExtToParamTests < Test::Unit::TestCase
   def test_number_array
     assert_equal '10/20', [10, 20].to_param
   end
-  
+
   def test_to_param_array
     assert_equal 'custom1/param1', [ToParam.new('custom'), ToParam.new('param')].to_param
   end
@@ -222,6 +222,11 @@ class ArrayToXmlTests < Test::Unit::TestCase
 
     assert xml.include?(%(<count>2</count>)), xml
   end
+
+  def test_to_xml_with_empty
+    xml = [].to_xml
+    assert_match(/type="array"\/>/, xml)
+  end
 end
 
 class ArrayExtractOptionsTests < Test::Unit::TestCase
@@ -234,17 +239,15 @@ class ArrayExtractOptionsTests < Test::Unit::TestCase
 end
 
 uses_mocha "ArrayExtRandomTests" do
+  class ArrayExtRandomTests < Test::Unit::TestCase
+    def test_random_element_from_array
+      assert_nil [].rand
 
-class ArrayExtRandomTests < Test::Unit::TestCase
-  def test_random_element_from_array
-    assert_nil [].rand
+      Kernel.expects(:rand).with(1).returns(0)
+      assert_equal 'x', ['x'].rand
 
-    Kernel.expects(:rand).with(1).returns(0)
-    assert_equal 'x', ['x'].rand
-
-    Kernel.expects(:rand).with(3).returns(1)
-    assert_equal 2, [1, 2, 3].rand
+      Kernel.expects(:rand).with(3).returns(1)
+      assert_equal 2, [1, 2, 3].rand
+    end
   end
 end
-
-end
diff --git a/vendor/rails/activesupport/test/core_ext/bigdecimal.rb b/vendor/rails/activesupport/test/core_ext/bigdecimal.rb
index 0417a2bc..9faad914 100644
--- a/vendor/rails/activesupport/test/core_ext/bigdecimal.rb
+++ b/vendor/rails/activesupport/test/core_ext/bigdecimal.rb
@@ -5,5 +5,6 @@ class BigDecimalTest < Test::Unit::TestCase
     assert_equal("--- 100000.30020320320000000000000000000000000000001\n", BigDecimal.new('100000.30020320320000000000000000000000000000001').to_yaml)
     assert_equal("--- .Inf\n", BigDecimal.new('Infinity').to_yaml)
     assert_equal("--- .NaN\n", BigDecimal.new('NaN').to_yaml)
+    assert_equal("--- -.Inf\n", BigDecimal.new('-Infinity').to_yaml)
   end
 end
\ No newline at end of file
diff --git a/vendor/rails/activesupport/test/core_ext/class_test.rb b/vendor/rails/activesupport/test/core_ext/class_test.rb
index 0346fad1..9c6071d4 100644
--- a/vendor/rails/activesupport/test/core_ext/class_test.rb
+++ b/vendor/rails/activesupport/test/core_ext/class_test.rb
@@ -38,9 +38,9 @@ class ClassTest < Test::Unit::TestCase
     @parent   = eval("class D; end; D")
     @sub      = eval("class E < D; end; E")
     @subofsub = eval("class F < E; end; F")
-    assert @parent.subclasses.all? { |i| [@sub.to_s, @subofsub.to_s].include?(i) }
     assert_equal 2, @parent.subclasses.size
     assert_equal [@subofsub.to_s], @sub.subclasses
     assert_equal [], @subofsub.subclasses
+    assert_equal [@sub.to_s, @subofsub.to_s].sort, @parent.subclasses.sort
   end
 end
diff --git a/vendor/rails/activesupport/test/core_ext/date_ext_test.rb b/vendor/rails/activesupport/test/core_ext/date_ext_test.rb
index 5925ae3a..0f3cf4c7 100644
--- a/vendor/rails/activesupport/test/core_ext/date_ext_test.rb
+++ b/vendor/rails/activesupport/test/core_ext/date_ext_test.rb
@@ -76,6 +76,7 @@ class DateExtCalculationsTest < Test::Unit::TestCase
     assert_equal Date.new(2008,3,31),  Date.new(2008,3,31).end_of_quarter
     assert_equal Date.new(2008,12,31), Date.new(2008,10,8).end_of_quarter
     assert_equal Date.new(2008,6,30),  Date.new(2008,4,14).end_of_quarter
+    assert_equal Date.new(2008,6,30),  Date.new(2008,5,31).end_of_quarter
     assert_equal Date.new(2008,9,30),  Date.new(2008,8,21).end_of_quarter
   end
 
@@ -171,7 +172,7 @@ class DateExtCalculationsTest < Test::Unit::TestCase
 
   def test_last_month_on_31st
     assert_equal Date.new(2004, 2, 29), Date.new(2004, 3, 31).last_month
-  end  
+  end
 
   def test_yesterday_constructor
     assert_equal Date.today - 1, Date.yesterday
@@ -196,7 +197,7 @@ class DateExtCalculationsTest < Test::Unit::TestCase
   def test_end_of_day
     assert_equal Time.local(2005,2,21,23,59,59), Date.new(2005,2,21).end_of_day
   end
-  
+
   def test_xmlschema
     with_env_tz 'US/Eastern' do
       assert_match(/^1980-02-28T00:00:00-05:?00$/, Date.new(1980, 2, 28).xmlschema)
@@ -208,7 +209,7 @@ class DateExtCalculationsTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   uses_mocha 'TestDateCurrent' do
     def test_current_returns_date_today_when_zone_default_not_set
       with_env_tz 'US/Central' do
@@ -217,10 +218,10 @@ class DateExtCalculationsTest < Test::Unit::TestCase
         assert_equal Date.new(1999, 12, 31), Date.current
       end
     end
-    
+
     def test_current_returns_time_zone_today_when_zone_default_set
       silence_warnings do # silence warnings raised by tzinfo gem
-        Time.zone_default = TimeZone['Eastern Time (US & Canada)']
+        Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
         with_env_tz 'US/Central' do
           Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
           assert_equal Date.new(1999, 12, 31), Date.today
@@ -238,5 +239,17 @@ class DateExtCalculationsTest < Test::Unit::TestCase
       yield
     ensure
       old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
-    end  
+    end
+end
+
+class DateExtBehaviorTest < Test::Unit::TestCase
+  def test_date_acts_like_date
+    assert Date.new.acts_like_date?
+  end
+
+  def test_freeze_doesnt_clobber_memoized_instance_methods
+    assert_nothing_raised do
+      Date.today.freeze.inspect
+    end
+  end
 end
diff --git a/vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb b/vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb
index ed45daf4..854a3a05 100644
--- a/vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb
@@ -219,14 +219,14 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
       assert_equal Rational(-6, 24), DateTime.local_offset
     end
   end
-  
+
   def test_utc?
     assert_equal true, DateTime.civil(2005, 2, 21, 10, 11, 12).utc?
     assert_equal true, DateTime.civil(2005, 2, 21, 10, 11, 12, 0).utc?
     assert_equal false, DateTime.civil(2005, 2, 21, 10, 11, 12, 0.25).utc?
     assert_equal false, DateTime.civil(2005, 2, 21, 10, 11, 12, -0.25).utc?
   end
-  
+
   def test_utc_offset
     assert_equal 0, DateTime.civil(2005, 2, 21, 10, 11, 12).utc_offset
     assert_equal 0, DateTime.civil(2005, 2, 21, 10, 11, 12, 0).utc_offset
@@ -234,7 +234,7 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal( -21600, DateTime.civil(2005, 2, 21, 10, 11, 12, -0.25).utc_offset )
     assert_equal( -18000, DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-5, 24)).utc_offset )
   end
-  
+
   def test_utc
     assert_equal DateTime.civil(2005, 2, 21, 16, 11, 12, 0), DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-6, 24)).utc
     assert_equal DateTime.civil(2005, 2, 21, 15, 11, 12, 0), DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-5, 24)).utc
@@ -242,37 +242,37 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal DateTime.civil(2005, 2, 21, 9, 11, 12, 0), DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(1, 24)).utc
     assert_equal DateTime.civil(2005, 2, 21, 9, 11, 12, 0), DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(1, 24)).getutc
   end
-  
+
   def test_formatted_offset_with_utc
     assert_equal '+00:00', DateTime.civil(2000).formatted_offset
     assert_equal '+0000', DateTime.civil(2000).formatted_offset(false)
     assert_equal 'UTC', DateTime.civil(2000).formatted_offset(true, 'UTC')
   end
-  
+
   def test_formatted_offset_with_local
     dt = DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-5, 24))
     assert_equal '-05:00', dt.formatted_offset
     assert_equal '-0500', dt.formatted_offset(false)
   end
-  
+
   def test_compare_with_time
     assert_equal  1, DateTime.civil(2000) <=> Time.utc(1999, 12, 31, 23, 59, 59)
     assert_equal  0, DateTime.civil(2000) <=> Time.utc(2000, 1, 1, 0, 0, 0)
     assert_equal(-1, DateTime.civil(2000) <=> Time.utc(2000, 1, 1, 0, 0, 1))
   end
-  
+
   def test_compare_with_datetime
     assert_equal  1, DateTime.civil(2000) <=> DateTime.civil(1999, 12, 31, 23, 59, 59)
     assert_equal  0, DateTime.civil(2000) <=> DateTime.civil(2000, 1, 1, 0, 0, 0)
     assert_equal(-1, DateTime.civil(2000) <=> DateTime.civil(2000, 1, 1, 0, 0, 1))
   end
-  
+
   def test_compare_with_time_with_zone
-    assert_equal  1, DateTime.civil(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(1999, 12, 31, 23, 59, 59), TimeZone['UTC'] )
-    assert_equal  0, DateTime.civil(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 0), TimeZone['UTC'] )
-    assert_equal(-1, DateTime.civil(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), TimeZone['UTC'] ))
+    assert_equal  1, DateTime.civil(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(1999, 12, 31, 23, 59, 59), ActiveSupport::TimeZone['UTC'] )
+    assert_equal  0, DateTime.civil(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 0), ActiveSupport::TimeZone['UTC'] )
+    assert_equal(-1, DateTime.civil(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), ActiveSupport::TimeZone['UTC'] ))
   end
-  
+
   def test_to_f
     assert_equal 946684800.0, DateTime.civil(2000).to_f
     assert_equal 946684800.0, DateTime.civil(1999,12,31,19,0,0,Rational(-5,24)).to_f
diff --git a/vendor/rails/activesupport/test/core_ext/duration_test.rb b/vendor/rails/activesupport/test/core_ext/duration_test.rb
index 7b17fe71..f802ed87 100644
--- a/vendor/rails/activesupport/test/core_ext/duration_test.rb
+++ b/vendor/rails/activesupport/test/core_ext/duration_test.rb
@@ -29,7 +29,7 @@ class DurationTest < Test::Unit::TestCase
       flunk("ArgumentError should be raised, but we got #{$!.class} instead")
     end
   end
-  
+
   uses_mocha 'TestDurationSinceAndAgoWithCurrentTime' do
     def test_since_and_ago_anchored_to_time_now_when_time_zone_default_not_set
       Time.zone_default = nil
@@ -43,10 +43,10 @@ class DurationTest < Test::Unit::TestCase
         assert_equal Time.local(1999,12,31,23,59,55), 5.seconds.ago
       end
     end
-    
+
     def test_since_and_ago_anchored_to_time_zone_now_when_time_zone_default_set
       silence_warnings do # silence warnings raised by tzinfo gem
-        Time.zone_default = TimeZone['Eastern Time (US & Canada)']
+        Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
         with_env_tz 'US/Eastern' do
           Time.stubs(:now).returns Time.local(2000)
           # since
@@ -63,7 +63,7 @@ class DurationTest < Test::Unit::TestCase
       Time.zone_default = nil
     end
   end
-  
+
   protected
     def with_env_tz(new_tz = 'US/Eastern')
       old_tz, ENV['TZ'] = ENV['TZ'], new_tz
diff --git a/vendor/rails/activesupport/test/core_ext/hash_ext_test.rb b/vendor/rails/activesupport/test/core_ext/hash_ext_test.rb
index 69028a12..9059ee2f 100644
--- a/vendor/rails/activesupport/test/core_ext/hash_ext_test.rb
+++ b/vendor/rails/activesupport/test/core_ext/hash_ext_test.rb
@@ -808,6 +808,27 @@ class QueryTest < Test::Unit::TestCase
       :person => {:id => [20, 10]}
   end
 
+  def test_expansion_count_is_limited
+    assert_raises RuntimeError do
+      attack_xml = <<-EOT
+      <?xml version="1.0" encoding="UTF-8"?>
+      <!DOCTYPE member [
+        <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
+        <!ENTITY b "&c;&c;&c;&c;&c;&c;&c;&c;&c;&c;">
+        <!ENTITY c "&d;&d;&d;&d;&d;&d;&d;&d;&d;&d;">
+        <!ENTITY d "&e;&e;&e;&e;&e;&e;&e;&e;&e;&e;">
+        <!ENTITY e "&f;&f;&f;&f;&f;&f;&f;&f;&f;&f;">
+        <!ENTITY f "&g;&g;&g;&g;&g;&g;&g;&g;&g;&g;">
+        <!ENTITY g "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx">
+      ]>
+      <member>
+      &a;
+      </member>
+      EOT
+      Hash.from_xml(attack_xml)
+    end
+  end
+
   private
     def assert_query_equal(expected, actual, message = nil)
       assert_equal expected.split('&'), actual.to_query.split('&')
diff --git a/vendor/rails/activesupport/test/core_ext/module/model_naming_test.rb b/vendor/rails/activesupport/test/core_ext/module/model_naming_test.rb
new file mode 100644
index 00000000..fc73fa5c
--- /dev/null
+++ b/vendor/rails/activesupport/test/core_ext/module/model_naming_test.rb
@@ -0,0 +1,19 @@
+require 'abstract_unit'
+
+class ModelNamingTest < Test::Unit::TestCase
+  def setup
+    @name = ActiveSupport::ModelName.new('Post::TrackBack')
+  end
+
+  def test_singular
+    assert_equal 'post_track_back', @name.singular
+  end
+
+  def test_plural
+    assert_equal 'post_track_backs', @name.plural
+  end
+
+  def test_partial_path
+    assert_equal 'post/track_backs/track_back', @name.partial_path
+  end
+end
diff --git a/vendor/rails/activesupport/test/core_ext/time_ext_test.rb b/vendor/rails/activesupport/test/core_ext/time_ext_test.rb
index e53b7193..c1bdee4c 100644
--- a/vendor/rails/activesupport/test/core_ext/time_ext_test.rb
+++ b/vendor/rails/activesupport/test/core_ext/time_ext_test.rb
@@ -449,7 +449,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal "17:44",                           time.to_s(:time)
     assert_equal "February 21, 2005 17:44",         time.to_s(:long)
     assert_equal "February 21st, 2005 17:44",       time.to_s(:long_ordinal)
-    with_env_tz "UTC" do 
+    with_env_tz "UTC" do
       assert_equal "Mon, 21 Feb 2005 17:44:30 +0000", time.to_s(:rfc822)
     end
   end
@@ -505,13 +505,13 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal 30, Time.days_in_month(11, 2005)
     assert_equal 31, Time.days_in_month(12, 2005)
   end
-  
+
   uses_mocha 'TestTimeDaysInMonthWithoutYearArg' do
     def test_days_in_month_feb_in_common_year_without_year_arg
       Time.stubs(:now).returns(Time.utc(2007))
       assert_equal 28, Time.days_in_month(2)
     end
-  
+
     def test_days_in_month_feb_in_leap_year_without_year_arg
       Time.stubs(:now).returns(Time.utc(2008))
       assert_equal 29, Time.days_in_month(2)
@@ -524,12 +524,16 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
     assert_equal Time.time_with_datetime_fallback(:local, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
     assert_equal Time.time_with_datetime_fallback(:utc, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, 0, 0)
-    assert_equal Time.time_with_datetime_fallback(:local, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
     assert_equal Time.time_with_datetime_fallback(:utc, 2005), Time.utc(2005)
     assert_equal Time.time_with_datetime_fallback(:utc, 2039), DateTime.civil(2039, 1, 1, 0, 0, 0, 0, 0)
     assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30, 1), Time.utc(2005, 2, 21, 17, 44, 30, 1) #with usec
-    assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
-    assert_equal ::Date::ITALY, Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1).start # use Ruby's default start value
+    # This won't overflow on 64bit linux
+    unless time_is_64bits?
+      assert_equal Time.time_with_datetime_fallback(:local, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
+      assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1),
+                   DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
+      assert_equal ::Date::ITALY, Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1).start # use Ruby's default start value
+    end
   end
 
   def test_utc_time
@@ -541,7 +545,10 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
   def test_local_time
     assert_equal Time.local_time(2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30)
     assert_equal Time.local_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
-    assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
+
+    unless time_is_64bits?
+      assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
+    end
   end
 
   def test_next_month_on_31st
@@ -559,13 +566,13 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
   def test_acts_like_time
     assert Time.new.acts_like_time?
   end
-  
+
   def test_formatted_offset_with_utc
     assert_equal '+00:00', Time.utc(2000).formatted_offset
     assert_equal '+0000', Time.utc(2000).formatted_offset(false)
     assert_equal 'UTC', Time.utc(2000).formatted_offset(true, 'UTC')
   end
-  
+
   def test_formatted_offset_with_local
     with_env_tz 'US/Eastern' do
       assert_equal '-05:00', Time.local(2000).formatted_offset
@@ -574,27 +581,27 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
       assert_equal '-0400', Time.local(2000, 7).formatted_offset(false)
     end
   end
-  
+
   def test_compare_with_time
     assert_equal  1, Time.utc(2000) <=> Time.utc(1999, 12, 31, 23, 59, 59, 999)
     assert_equal  0, Time.utc(2000) <=> Time.utc(2000, 1, 1, 0, 0, 0)
     assert_equal(-1, Time.utc(2000) <=> Time.utc(2000, 1, 1, 0, 0, 0, 001))
   end
-  
+
   def test_compare_with_datetime
     assert_equal  1, Time.utc(2000) <=> DateTime.civil(1999, 12, 31, 23, 59, 59)
     assert_equal  0, Time.utc(2000) <=> DateTime.civil(2000, 1, 1, 0, 0, 0)
     assert_equal(-1, Time.utc(2000) <=> DateTime.civil(2000, 1, 1, 0, 0, 1))
   end
-  
+
   def test_compare_with_time_with_zone
-    assert_equal  1, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(1999, 12, 31, 23, 59, 59), TimeZone['UTC'] )
-    assert_equal  0, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 0), TimeZone['UTC'] )
-    assert_equal(-1, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), TimeZone['UTC'] ))
+    assert_equal  1, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(1999, 12, 31, 23, 59, 59), ActiveSupport::TimeZone['UTC'] )
+    assert_equal  0, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 0), ActiveSupport::TimeZone['UTC'] )
+    assert_equal(-1, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), ActiveSupport::TimeZone['UTC'] ))
   end
-  
+
   def test_minus_with_time_with_zone
-    assert_equal  86_400.0, Time.utc(2000, 1, 2) - ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), TimeZone['UTC'] )
+    assert_equal  86_400.0, Time.utc(2000, 1, 2) - ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['UTC'] )
   end
 
   def test_time_created_with_local_constructor_cannot_represent_times_during_hour_skipped_by_dst
@@ -608,7 +615,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
 
   def test_case_equality
     assert Time === Time.utc(2000)
-    assert Time === ActiveSupport::TimeWithZone.new(Time.utc(2000), TimeZone['UTC'])
+    assert Time === ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone['UTC'])
     assert_equal false, Time === DateTime.civil(2000)
   end
 
@@ -619,4 +626,42 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
     ensure
       old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
     end
+
+    def time_is_64bits?
+      Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1).is_a?(Time)
+    end
+end
+
+class TimeExtMarshalingTest < Test::Unit::TestCase
+  def test_marshaling_with_utc_instance
+    t = Time.utc(2000)
+    marshaled = Marshal.dump t
+    unmarshaled = Marshal.load marshaled
+    assert_equal t, unmarshaled
+    assert_equal t.zone, unmarshaled.zone
+  end
+  
+  def test_marshaling_with_local_instance  
+    t = Time.local(2000)
+    marshaled = Marshal.dump t
+    unmarshaled = Marshal.load marshaled
+    assert_equal t, unmarshaled
+    assert_equal t.zone, unmarshaled.zone
+  end
+    
+  def test_marshaling_with_frozen_utc_instance  
+    t = Time.utc(2000).freeze
+    marshaled = Marshal.dump t
+    unmarshaled = Marshal.load marshaled
+    assert_equal t, unmarshaled
+    assert_equal t.zone, unmarshaled.zone
+  end
+  
+  def test_marshaling_with_frozen_local_instance  
+    t = Time.local(2000).freeze
+    marshaled = Marshal.dump t
+    unmarshaled = Marshal.load marshaled
+    assert_equal t, unmarshaled
+    assert_equal t.zone, unmarshaled.zone
+  end
 end
diff --git a/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb b/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb
index c373bca8..dfe04485 100644
--- a/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb
@@ -1,10 +1,10 @@
 require 'abstract_unit'
-  
+
 class TimeWithZoneTest < Test::Unit::TestCase
 
   def setup
     @utc = Time.utc(2000, 1, 1, 0)
-    @time_zone = TimeZone['Eastern Time (US & Canada)']
+    @time_zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     @twz = ActiveSupport::TimeWithZone.new(@utc, @time_zone)
   end
 
@@ -21,114 +21,114 @@ class TimeWithZoneTest < Test::Unit::TestCase
   def test_time_zone
     assert_equal @time_zone, @twz.time_zone
   end
-  
+
   def test_in_time_zone
     Time.use_zone 'Alaska' do
-      assert_equal ActiveSupport::TimeWithZone.new(@utc, TimeZone['Alaska']), @twz.in_time_zone
+      assert_equal ActiveSupport::TimeWithZone.new(@utc, ActiveSupport::TimeZone['Alaska']), @twz.in_time_zone
     end
   end
 
   def test_in_time_zone_with_argument
-    assert_equal ActiveSupport::TimeWithZone.new(@utc, TimeZone['Alaska']), @twz.in_time_zone('Alaska')
+    assert_equal ActiveSupport::TimeWithZone.new(@utc, ActiveSupport::TimeZone['Alaska']), @twz.in_time_zone('Alaska')
   end
-  
+
   def test_in_time_zone_with_new_zone_equal_to_old_zone_does_not_create_new_object
-    assert_equal @twz.object_id, @twz.in_time_zone(TimeZone['Eastern Time (US & Canada)']).object_id
+    assert_equal @twz.object_id, @twz.in_time_zone(ActiveSupport::TimeZone['Eastern Time (US & Canada)']).object_id
   end
 
   def test_utc?
     assert_equal false, @twz.utc?
-    assert_equal true, ActiveSupport::TimeWithZone.new(Time.utc(2000), TimeZone['UTC']).utc?
+    assert_equal true, ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone['UTC']).utc?
   end
-    
+
   def test_formatted_offset
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal '-05:00', @twz.formatted_offset
       assert_equal '-04:00', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).formatted_offset #dst
     end
   end
-    
+
   def test_dst?
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal false, @twz.dst?
       assert_equal true, ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).dst?
     end
   end
-    
+
   def test_zone
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal 'EST', @twz.zone
       assert_equal 'EDT', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).zone #dst
     end
   end
-    
+
   def test_to_json
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal "\"1999/12/31 19:00:00 -0500\"", @twz.to_json
     end
   end
-  
+
   def test_to_json_with_use_standard_json_time_format_config_set_to_true
     old, ActiveSupport.use_standard_json_time_format = ActiveSupport.use_standard_json_time_format, true
     assert_equal "\"1999-12-31T19:00:00-05:00\"", @twz.to_json
   ensure
     ActiveSupport.use_standard_json_time_format = old
   end
-    
+
   def test_strftime
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal '1999-12-31 19:00:00 EST -0500', @twz.strftime('%Y-%m-%d %H:%M:%S %Z %z')
     end
   end
-    
+
   def test_inspect
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal 'Fri, 31 Dec 1999 19:00:00 EST -05:00', @twz.inspect
     end
   end
-    
+
   def test_to_s
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal '1999-12-31 19:00:00 -0500', @twz.to_s
     end
   end
-    
+
   def test_to_s_db
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal '2000-01-01 00:00:00', @twz.to_s(:db)
     end
   end
-    
+
   def test_xmlschema
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal "1999-12-31T19:00:00-05:00", @twz.xmlschema
     end
   end
-  
+
   def test_to_yaml
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal "--- 1999-12-31 19:00:00 -05:00\n", @twz.to_yaml
     end
   end
-  
+
   def test_ruby_to_yaml
     silence_warnings do
       assert_equal "--- \n:twz: 2000-01-01 00:00:00 Z\n", {:twz => @twz}.to_yaml
     end
   end
-  
+
   def test_httpdate
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal 'Sat, 01 Jan 2000 00:00:00 GMT', @twz.httpdate
     end
   end
-  
+
   def test_rfc2822
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal "Fri, 31 Dec 1999 19:00:00 -0500", @twz.rfc2822
     end
   end
-  
+
   def test_compare_with_time
     assert_equal  1, @twz <=> Time.utc(1999, 12, 31, 23, 59, 59)
     assert_equal  0, @twz <=> Time.utc(2000, 1, 1, 0, 0, 0)
@@ -142,27 +142,27 @@ class TimeWithZoneTest < Test::Unit::TestCase
   end
 
   def test_compare_with_time_with_zone
-    assert_equal  1, @twz <=> ActiveSupport::TimeWithZone.new( Time.utc(1999, 12, 31, 23, 59, 59), TimeZone['UTC'] )
-    assert_equal  0, @twz <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 0), TimeZone['UTC'] )
-    assert_equal(-1, @twz <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), TimeZone['UTC'] ))
+    assert_equal  1, @twz <=> ActiveSupport::TimeWithZone.new( Time.utc(1999, 12, 31, 23, 59, 59), ActiveSupport::TimeZone['UTC'] )
+    assert_equal  0, @twz <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 0), ActiveSupport::TimeZone['UTC'] )
+    assert_equal(-1, @twz <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), ActiveSupport::TimeZone['UTC'] ))
   end
-  
+
   def test_between?
     assert @twz.between?(Time.utc(1999,12,31,23,59,59), Time.utc(2000,1,1,0,0,1))
     assert_equal false, @twz.between?(Time.utc(2000,1,1,0,0,1), Time.utc(2000,1,1,0,0,2))
   end
-  
+
   def test_eql?
     assert @twz.eql?(Time.utc(2000))
-    assert @twz.eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), TimeZone["Hawaii"]) )
+    assert @twz.eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]) )
   end
-    
+
   def test_plus_with_integer
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal Time.utc(1999, 12, 31, 19, 0 ,5), (@twz + 5).time
     end
   end
-    
+
   def test_plus_with_integer_when_self_wraps_datetime
     silence_warnings do # silence warnings raised by tzinfo gem
       datetime = DateTime.civil(2000, 1, 1, 0)
@@ -170,26 +170,26 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_equal DateTime.civil(1999, 12, 31, 19, 0 ,5), (twz + 5).time
     end
   end
-  
+
   def test_plus_when_crossing_time_class_limit
     silence_warnings do # silence warnings raised by tzinfo gem
       twz = ActiveSupport::TimeWithZone.new(Time.utc(2038, 1, 19), @time_zone)
       assert_equal [0, 0, 19, 19, 1, 2038], (twz + 86_400).to_a[0,6]
     end
   end
-    
+
   def test_plus_with_duration
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal Time.utc(2000, 1, 5, 19, 0 ,0), (@twz + 5.days).time
     end
   end
-    
+
   def test_minus_with_integer
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal Time.utc(1999, 12, 31, 18, 59 ,55), (@twz - 5).time
     end
   end
-  
+
   def test_minus_with_integer_when_self_wraps_datetime
     silence_warnings do # silence warnings raised by tzinfo gem
       datetime = DateTime.civil(2000, 1, 1, 0)
@@ -197,24 +197,24 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_equal DateTime.civil(1999, 12, 31, 18, 59 ,55), (twz - 5).time
     end
   end
-    
+
   def test_minus_with_duration
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal Time.utc(1999, 12, 26, 19, 0 ,0), (@twz - 5.days).time
     end
   end
-  
+
   def test_minus_with_time
-    assert_equal  86_400.0,  ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), TimeZone['UTC'] ) - Time.utc(2000, 1, 1)
-    assert_equal  86_400.0,  ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), TimeZone['Hawaii'] ) - Time.utc(2000, 1, 1)
+    assert_equal  86_400.0,  ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) - Time.utc(2000, 1, 1)
+    assert_equal  86_400.0,  ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), ActiveSupport::TimeZone['Hawaii'] ) - Time.utc(2000, 1, 1)
   end
-  
+
   def test_minus_with_time_with_zone
-    twz1 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), TimeZone['UTC'] )
-    twz2 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), TimeZone['UTC'] )
+    twz1 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['UTC'] )
+    twz2 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), ActiveSupport::TimeZone['UTC'] )
     assert_equal  86_400.0,  twz2 - twz1
   end
-  
+
   def test_plus_and_minus_enforce_spring_dst_rules
     silence_warnings do # silence warnings raised by tzinfo gem
       utc = Time.utc(2006,4,2,6,59,59) # == Apr 2 2006 01:59:59 EST; i.e., 1 second before daylight savings start
@@ -232,7 +232,7 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_equal 'EST', twz.zone
     end
   end
-  
+
   def test_plus_and_minus_enforce_fall_dst_rules
     silence_warnings do # silence warnings raised by tzinfo gem
       utc = Time.utc(2006,10,29,5,59,59) # == Oct 29 2006 01:59:59 EST; i.e., 1 second before daylight savings end
@@ -250,25 +250,25 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_equal 'EDT', twz.zone
     end
   end
-  
+
   def test_to_a
     silence_warnings do # silence warnings raised by tzinfo gem
-      assert_equal [45, 30, 5, 1, 2, 2000, 2, 32, false, "HST"], ActiveSupport::TimeWithZone.new( Time.utc(2000, 2, 1, 15, 30, 45), TimeZone['Hawaii'] ).to_a
+      assert_equal [45, 30, 5, 1, 2, 2000, 2, 32, false, "HST"], ActiveSupport::TimeWithZone.new( Time.utc(2000, 2, 1, 15, 30, 45), ActiveSupport::TimeZone['Hawaii'] ).to_a
     end
   end
-  
+
   def test_to_f
-    result = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), TimeZone['Hawaii'] ).to_f
+    result = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['Hawaii'] ).to_f
     assert_equal 946684800.0, result
     assert result.is_a?(Float)
   end
-  
+
   def test_to_i
-    result = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), TimeZone['Hawaii'] ).to_i
+    result = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['Hawaii'] ).to_i
     assert_equal 946684800, result
     assert result.is_a?(Integer)
   end
-    
+
   def test_to_time
     assert_equal @twz, @twz.to_time
   end
@@ -276,94 +276,102 @@ class TimeWithZoneTest < Test::Unit::TestCase
   def test_to_date
     silence_warnings do # silence warnings raised by tzinfo gem
       # 1 sec before midnight Jan 1 EST
-      assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 4, 59, 59), TimeZone['Eastern Time (US & Canada)'] ).to_date
+      assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 4, 59, 59), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date
       # midnight Jan 1 EST
-      assert_equal Date.new(2000,  1,  1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 5,  0,  0), TimeZone['Eastern Time (US & Canada)'] ).to_date
+      assert_equal Date.new(2000,  1,  1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 5,  0,  0), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date
       # 1 sec before midnight Jan 2 EST
-      assert_equal Date.new(2000,  1,  1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 4, 59, 59), TimeZone['Eastern Time (US & Canada)'] ).to_date
+      assert_equal Date.new(2000,  1,  1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 4, 59, 59), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date
       # midnight Jan 2 EST
-      assert_equal Date.new(2000,  1,  2), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 5,  0,  0), TimeZone['Eastern Time (US & Canada)'] ).to_date
+      assert_equal Date.new(2000,  1,  2), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 5,  0,  0), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date
     end
   end
-  
+
   def test_to_datetime
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal DateTime.civil(1999, 12, 31, 19, 0, 0, Rational(-18_000, 86_400)),  @twz.to_datetime
     end
   end
-    
+
   def test_acts_like_time
     assert @twz.acts_like?(:time)
     assert ActiveSupport::TimeWithZone.new(DateTime.civil(2000), @time_zone).acts_like?(:time)
   end
-  
+
   def test_acts_like_date
     assert_equal false, @twz.acts_like?(:date)
     assert_equal false, ActiveSupport::TimeWithZone.new(DateTime.civil(2000), @time_zone).acts_like?(:date)
   end
-  
+
   def test_is_a
     assert @twz.is_a?(Time)
     assert @twz.kind_of?(Time)
     assert @twz.is_a?(ActiveSupport::TimeWithZone)
   end
-    
+
   def test_method_missing_with_time_return_value
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_instance_of ActiveSupport::TimeWithZone, @twz.months_since(1)
       assert_equal Time.utc(2000, 1, 31, 19, 0 ,0), @twz.months_since(1).time
     end
   end
-  
+
   def test_marshal_dump_and_load
     silence_warnings do # silence warnings raised by tzinfo gem
       marshal_str = Marshal.dump(@twz)
       mtime = Marshal.load(marshal_str)
       assert_equal Time.utc(2000, 1, 1, 0), mtime.utc
-      assert_equal TimeZone['Eastern Time (US & Canada)'], mtime.time_zone
+      assert mtime.utc.utc?
+      assert_equal ActiveSupport::TimeZone['Eastern Time (US & Canada)'], mtime.time_zone
       assert_equal Time.utc(1999, 12, 31, 19), mtime.time
+      assert mtime.time.utc?
+      assert_equal @twz.inspect, mtime.inspect
     end
   end
-  
+
   def test_marshal_dump_and_load_with_tzinfo_identifier
     silence_warnings do # silence warnings raised by tzinfo gem
       twz = ActiveSupport::TimeWithZone.new(@utc, TZInfo::Timezone.get('America/New_York'))
       marshal_str = Marshal.dump(twz)
       mtime = Marshal.load(marshal_str)
       assert_equal Time.utc(2000, 1, 1, 0), mtime.utc
+      assert mtime.utc.utc?
       assert_equal 'America/New_York', mtime.time_zone.name
       assert_equal Time.utc(1999, 12, 31, 19), mtime.time
+      assert mtime.time.utc?
+      assert_equal @twz.inspect, mtime.inspect
     end
   end
-  
-  def test_method_missing_with_non_time_return_value
-    silence_warnings do # silence warnings raised by tzinfo gem
-      @twz.time.expects(:foo).returns('bar')
-      assert_equal 'bar', @twz.foo
+
+  uses_mocha 'TestDatePartValueMethods' do
+    def test_method_missing_with_non_time_return_value
+      silence_warnings do # silence warnings raised by tzinfo gem
+        @twz.time.expects(:foo).returns('bar')
+        assert_equal 'bar', @twz.foo
+      end
+    end
+
+    def test_date_part_value_methods
+      silence_warnings do # silence warnings raised by tzinfo gem
+        twz = ActiveSupport::TimeWithZone.new(Time.utc(1999,12,31,19,18,17,500), @time_zone)
+        twz.stubs(:method_missing).returns(nil) #ensure these methods are defined directly on class
+        assert_equal 1999, twz.year
+        assert_equal 12, twz.month
+        assert_equal 31, twz.day
+        assert_equal 14, twz.hour
+        assert_equal 18, twz.min
+        assert_equal 17, twz.sec
+        assert_equal 500, twz.usec
+      end
     end
   end
-  
-  def test_date_part_value_methods
-    silence_warnings do # silence warnings raised by tzinfo gem
-      twz = ActiveSupport::TimeWithZone.new(Time.utc(1999,12,31,19,18,17,500), @time_zone)
-      twz.stubs(:method_missing).returns(nil) #ensure these methods are defined directly on class
-      assert_equal 1999, twz.year
-      assert_equal 12, twz.month
-      assert_equal 31, twz.day
-      assert_equal 14, twz.hour
-      assert_equal 18, twz.min
-      assert_equal 17, twz.sec
-      assert_equal 500, twz.usec
-    end
-  end
-  
+
   def test_usec_returns_0_when_datetime_is_wrapped
     silence_warnings do # silence warnings raised by tzinfo gem
       twz = ActiveSupport::TimeWithZone.new(DateTime.civil(2000), @time_zone)
       assert_equal 0, twz.usec
     end
   end
-  
+
   def test_utc_to_local_conversion_saves_period_in_instance_variable
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_nil @twz.instance_variable_get('@period')
@@ -371,14 +379,14 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_kind_of TZInfo::TimezonePeriod, @twz.instance_variable_get('@period')
     end
   end
-  
+
   def test_instance_created_with_local_time_returns_correct_utc_time
     silence_warnings do # silence warnings raised by tzinfo gem
       twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(1999, 12, 31, 19))
       assert_equal Time.utc(2000), twz.utc
     end
   end
-  
+
   def test_instance_created_with_local_time_enforces_spring_dst_rules
     silence_warnings do # silence warnings raised by tzinfo gem
       twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,2)) # first second of DST
@@ -387,7 +395,7 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_equal 'EDT', twz.zone
     end
   end
-  
+
   def test_instance_created_with_local_time_enforces_fall_dst_rules
     silence_warnings do # silence warnings raised by tzinfo gem
       twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,29,1)) # 1AM can be either DST or non-DST; we'll pick DST
@@ -396,14 +404,14 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_equal 'EDT', twz.zone
     end
   end
-  
+
   def test_ruby_19_weekday_name_query_methods
     ruby_19_or_greater = RUBY_VERSION >= '1.9'
     %w(sunday? monday? tuesday? wednesday? thursday? friday? saturday?).each do |name|
       assert_equal ruby_19_or_greater, @twz.respond_to?(name)
     end
   end
-  
+
   def test_utc_to_local_conversion_with_far_future_datetime
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal [0,0,19,31,12,2049], ActiveSupport::TimeWithZone.new(DateTime.civil(2050), @time_zone).to_a[0,6]
@@ -415,7 +423,7 @@ class TimeWithZoneTest < Test::Unit::TestCase
       assert_equal DateTime.civil(2050).to_f, ActiveSupport::TimeWithZone.new(nil, @time_zone, DateTime.civil(2049,12,31,19)).to_f
     end
   end
-  
+
   def test_change
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Mon, 31 Dec 2001 19:00:00 EST -05:00", @twz.change(:year => 2001).inspect
@@ -426,7 +434,7 @@ class TimeWithZoneTest < Test::Unit::TestCase
     assert_equal "Fri, 31 Dec 1999 19:15:00 EST -05:00", @twz.change(:min => 15).inspect
     assert_equal "Fri, 31 Dec 1999 19:00:30 EST -05:00", @twz.change(:sec => 30).inspect
   end
-  
+
   def test_advance
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Mon, 31 Dec 2001 19:00:00 EST -05:00", @twz.advance(:years => 2).inspect
@@ -436,94 +444,262 @@ class TimeWithZoneTest < Test::Unit::TestCase
     assert_equal "Fri, 31 Dec 1999 19:15:00 EST -05:00", @twz.advance(:minutes => 15).inspect
     assert_equal "Fri, 31 Dec 1999 19:00:30 EST -05:00", @twz.advance(:seconds => 30).inspect
   end
-  
+
   def beginning_of_year
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 01 Jan 1999 00:00:00 EST -05:00", @twz.beginning_of_year.inspect
   end
-  
+
   def end_of_year
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_year.inspect
   end
-  
+
   def beginning_of_month
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 01 Dec 1999 00:00:00 EST -05:00", @twz.beginning_of_month.inspect
   end
-  
+
   def end_of_month
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_month.inspect
   end
-  
+
   def beginning_of_day
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 31 Dec 1999 00:00:00 EST -05:00", @twz.beginning_of_day.inspect
   end
-  
+
   def end_of_day
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_day.inspect
   end
-  
+
   def test_since
     assert_equal "Fri, 31 Dec 1999 19:00:01 EST -05:00", @twz.since(1).inspect
   end
-  
+
   def test_ago
     assert_equal "Fri, 31 Dec 1999 18:59:59 EST -05:00", @twz.ago(1).inspect
   end
-  
+
   def test_seconds_since_midnight
     assert_equal 19 * 60 * 60, @twz.seconds_since_midnight
   end
-  
+
   def test_advance_1_year_from_leap_day
     twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2004,2,29))
     assert_equal "Mon, 28 Feb 2005 00:00:00 EST -05:00", twz.advance(:years => 1).inspect
     assert_equal "Mon, 28 Feb 2005 00:00:00 EST -05:00", twz.years_since(1).inspect
+    assert_equal "Mon, 28 Feb 2005 00:00:00 EST -05:00", twz.since(1.year).inspect
     assert_equal "Mon, 28 Feb 2005 00:00:00 EST -05:00", (twz + 1.year).inspect
   end
-  
+
   def test_advance_1_month_from_last_day_of_january
     twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2005,1,31))
     assert_equal "Mon, 28 Feb 2005 00:00:00 EST -05:00", twz.advance(:months => 1).inspect
     assert_equal "Mon, 28 Feb 2005 00:00:00 EST -05:00", twz.months_since(1).inspect
+    assert_equal "Mon, 28 Feb 2005 00:00:00 EST -05:00", twz.since(1.month).inspect
     assert_equal "Mon, 28 Feb 2005 00:00:00 EST -05:00", (twz + 1.month).inspect
   end
-  
+
   def test_advance_1_month_from_last_day_of_january_during_leap_year
     twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2000,1,31))
     assert_equal "Tue, 29 Feb 2000 00:00:00 EST -05:00", twz.advance(:months => 1).inspect
     assert_equal "Tue, 29 Feb 2000 00:00:00 EST -05:00", twz.months_since(1).inspect
+    assert_equal "Tue, 29 Feb 2000 00:00:00 EST -05:00", twz.since(1.month).inspect
     assert_equal "Tue, 29 Feb 2000 00:00:00 EST -05:00", (twz + 1.month).inspect
   end
-  
+
   def test_advance_1_month_into_spring_dst_gap
     twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,3,2,2))
     assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", twz.advance(:months => 1).inspect
     assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", twz.months_since(1).inspect
+    assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", twz.since(1.month).inspect
     assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", (twz + 1.month).inspect
   end
-  
+
   def test_advance_1_second_into_spring_dst_gap
     twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,1,59,59))
     assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", twz.advance(:seconds => 1).inspect
     assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", (twz + 1).inspect
+    assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", twz.since(1).inspect
+    assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", twz.since(1.second).inspect
     assert_equal "Sun, 02 Apr 2006 03:00:00 EDT -04:00", (twz + 1.second).inspect
   end
+
+  def test_advance_1_day_across_spring_dst_transition
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,1,10,30))
+    # In 2006, spring DST transition occurred Apr 2 at 2AM; this day was only 23 hours long
+    # When we advance 1 day, we want to end up at the same time on the next day
+    assert_equal "Sun, 02 Apr 2006 10:30:00 EDT -04:00", twz.advance(:days => 1).inspect
+    assert_equal "Sun, 02 Apr 2006 10:30:00 EDT -04:00", twz.since(1.days).inspect
+    assert_equal "Sun, 02 Apr 2006 10:30:00 EDT -04:00", (twz + 1.days).inspect
+    assert_equal "Sun, 02 Apr 2006 10:30:01 EDT -04:00", twz.since(1.days + 1.second).inspect
+    assert_equal "Sun, 02 Apr 2006 10:30:01 EDT -04:00", (twz + 1.days + 1.second).inspect
+  end
+  
+  def test_advance_1_day_across_spring_dst_transition_backwards
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,10,30))
+    # In 2006, spring DST transition occurred Apr 2 at 2AM; this day was only 23 hours long
+    # When we advance back 1 day, we want to end up at the same time on the previous day
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.advance(:days => -1).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.ago(1.days).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", (twz - 1.days).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:01 EST -05:00", twz.ago(1.days - 1.second).inspect
+  end
+    
+  def test_advance_1_day_expressed_as_number_of_seconds_minutes_or_hours_across_spring_dst_transition
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,1,10,30))
+    # In 2006, spring DST transition occurred Apr 2 at 2AM; this day was only 23 hours long
+    # When we advance a specific number of hours, minutes or seconds, we want to advance exactly that amount
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", (twz + 86400).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", (twz + 86400.seconds).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", twz.since(86400).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", twz.since(86400.seconds).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", twz.advance(:seconds => 86400).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", (twz + 1440.minutes).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", twz.since(1440.minutes).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", twz.advance(:minutes => 1440).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", (twz + 24.hours).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", twz.since(24.hours).inspect
+    assert_equal "Sun, 02 Apr 2006 11:30:00 EDT -04:00", twz.advance(:hours => 24).inspect
+  end
+  
+  def test_advance_1_day_expressed_as_number_of_seconds_minutes_or_hours_across_spring_dst_transition_backwards
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,11,30))
+    # In 2006, spring DST transition occurred Apr 2 at 2AM; this day was only 23 hours long
+    # When we advance a specific number of hours, minutes or seconds, we want to advance exactly that amount
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", (twz - 86400).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", (twz - 86400.seconds).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.ago(86400).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.ago(86400.seconds).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.advance(:seconds => -86400).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", (twz - 1440.minutes).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.ago(1440.minutes).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.advance(:minutes => -1440).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", (twz - 24.hours).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.ago(24.hours).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.advance(:hours => -24).inspect
+  end
+  
+  def test_advance_1_day_across_fall_dst_transition
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,28,10,30))
+    # In 2006, fall DST transition occurred Oct 29 at 2AM; this day was 25 hours long
+    # When we advance 1 day, we want to end up at the same time on the next day
+    assert_equal "Sun, 29 Oct 2006 10:30:00 EST -05:00", twz.advance(:days => 1).inspect
+    assert_equal "Sun, 29 Oct 2006 10:30:00 EST -05:00", twz.since(1.days).inspect
+    assert_equal "Sun, 29 Oct 2006 10:30:00 EST -05:00", (twz + 1.days).inspect
+    assert_equal "Sun, 29 Oct 2006 10:30:01 EST -05:00", twz.since(1.days + 1.second).inspect
+    assert_equal "Sun, 29 Oct 2006 10:30:01 EST -05:00", (twz + 1.days + 1.second).inspect
+  end
+  
+  def test_advance_1_day_across_fall_dst_transition_backwards
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,29,10,30))
+    # In 2006, fall DST transition occurred Oct 29 at 2AM; this day was 25 hours long
+    # When we advance backwards 1 day, we want to end up at the same time on the previous day
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.advance(:days => -1).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.ago(1.days).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", (twz - 1.days).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:01 EDT -04:00", twz.ago(1.days - 1.second).inspect
+  end
+  
+  def test_advance_1_day_expressed_as_number_of_seconds_minutes_or_hours_across_fall_dst_transition
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,28,10,30))
+    # In 2006, fall DST transition occurred Oct 29 at 2AM; this day was 25 hours long
+    # When we advance a specific number of hours, minutes or seconds, we want to advance exactly that amount
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", (twz + 86400).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", (twz + 86400.seconds).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", twz.since(86400).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", twz.since(86400.seconds).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", twz.advance(:seconds => 86400).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", (twz + 1440.minutes).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", twz.since(1440.minutes).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", twz.advance(:minutes => 1440).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", (twz + 24.hours).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", twz.since(24.hours).inspect
+    assert_equal "Sun, 29 Oct 2006 09:30:00 EST -05:00", twz.advance(:hours => 24).inspect
+  end
+  
+  def test_advance_1_day_expressed_as_number_of_seconds_minutes_or_hours_across_fall_dst_transition_backwards
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,29,9,30))
+    # In 2006, fall DST transition occurred Oct 29 at 2AM; this day was 25 hours long
+    # When we advance a specific number of hours, minutes or seconds, we want to advance exactly that amount
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", (twz - 86400).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", (twz - 86400.seconds).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.ago(86400).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.ago(86400.seconds).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.advance(:seconds => -86400).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", (twz - 1440.minutes).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.ago(1440.minutes).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.advance(:minutes => -1440).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", (twz - 24.hours).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.ago(24.hours).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.advance(:hours => -24).inspect
+  end
+
+  def test_advance_1_month_across_spring_dst_transition
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,1,10,30))
+    assert_equal "Mon, 01 May 2006 10:30:00 EDT -04:00", twz.advance(:months => 1).inspect
+    assert_equal "Mon, 01 May 2006 10:30:00 EDT -04:00", twz.months_since(1).inspect
+    assert_equal "Mon, 01 May 2006 10:30:00 EDT -04:00", twz.since(1.month).inspect
+    assert_equal "Mon, 01 May 2006 10:30:00 EDT -04:00", (twz + 1.month).inspect
+  end
+
+  def test_advance_1_month_across_spring_dst_transition_backwards
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,5,1,10,30))
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.advance(:months => -1).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.months_ago(1).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", twz.ago(1.month).inspect
+    assert_equal "Sat, 01 Apr 2006 10:30:00 EST -05:00", (twz - 1.month).inspect
+  end
+
+  def test_advance_1_month_across_fall_dst_transition
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,28,10,30))
+    assert_equal "Tue, 28 Nov 2006 10:30:00 EST -05:00", twz.advance(:months => 1).inspect
+    assert_equal "Tue, 28 Nov 2006 10:30:00 EST -05:00", twz.months_since(1).inspect
+    assert_equal "Tue, 28 Nov 2006 10:30:00 EST -05:00", twz.since(1.month).inspect
+    assert_equal "Tue, 28 Nov 2006 10:30:00 EST -05:00", (twz + 1.month).inspect
+  end
+
+  def test_advance_1_month_across_fall_dst_transition_backwards
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,11,28,10,30))
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.advance(:months => -1).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.months_ago(1).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", twz.ago(1.month).inspect
+    assert_equal "Sat, 28 Oct 2006 10:30:00 EDT -04:00", (twz - 1.month).inspect
+  end
+  
+  def test_advance_1_year
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2008,2,15,10,30))
+    assert_equal "Sun, 15 Feb 2009 10:30:00 EST -05:00", twz.advance(:years => 1).inspect
+    assert_equal "Sun, 15 Feb 2009 10:30:00 EST -05:00", twz.years_since(1).inspect
+    assert_equal "Sun, 15 Feb 2009 10:30:00 EST -05:00", (twz + 1.year).inspect
+    assert_equal "Thu, 15 Feb 2007 10:30:00 EST -05:00", twz.advance(:years => -1).inspect
+    assert_equal "Thu, 15 Feb 2007 10:30:00 EST -05:00", twz.years_ago(1).inspect
+    assert_equal "Thu, 15 Feb 2007 10:30:00 EST -05:00", (twz - 1.year).inspect
+  end
+  
+  def test_advance_1_year_during_dst
+    twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2008,7,15,10,30))
+    assert_equal "Wed, 15 Jul 2009 10:30:00 EDT -04:00", twz.advance(:years => 1).inspect
+    assert_equal "Wed, 15 Jul 2009 10:30:00 EDT -04:00", twz.years_since(1).inspect
+    assert_equal "Wed, 15 Jul 2009 10:30:00 EDT -04:00", (twz + 1.year).inspect
+    assert_equal "Sun, 15 Jul 2007 10:30:00 EDT -04:00", twz.advance(:years => -1).inspect
+    assert_equal "Sun, 15 Jul 2007 10:30:00 EDT -04:00", twz.years_ago(1).inspect
+    assert_equal "Sun, 15 Jul 2007 10:30:00 EDT -04:00", (twz - 1.year).inspect
+  end
 end
 
 class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
   def setup
     @t, @dt = Time.utc(2000), DateTime.civil(2000)
   end
-  
+
   def teardown
     Time.zone = nil
   end
-  
+
   def test_in_time_zone
     silence_warnings do # silence warnings raised by tzinfo gem
       Time.use_zone 'Alaska' do
@@ -554,7 +730,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_in_time_zone_with_time_local_instance
     silence_warnings do # silence warnings raised by tzinfo gem
       with_env_tz 'US/Eastern' do
@@ -563,85 +739,85 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_use_zone
     Time.zone = 'Alaska'
     Time.use_zone 'Hawaii' do
-      assert_equal TimeZone['Hawaii'], Time.zone
+      assert_equal ActiveSupport::TimeZone['Hawaii'], Time.zone
     end
-    assert_equal TimeZone['Alaska'], Time.zone
+    assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
   end
-  
+
   def test_use_zone_with_exception_raised
     Time.zone = 'Alaska'
     assert_raises RuntimeError do
       Time.use_zone('Hawaii') { raise RuntimeError }
     end
-    assert_equal TimeZone['Alaska'], Time.zone
+    assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
   end
-  
+
   def test_time_zone_getter_and_setter
-    Time.zone = TimeZone['Alaska']
-    assert_equal TimeZone['Alaska'], Time.zone
+    Time.zone = ActiveSupport::TimeZone['Alaska']
+    assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
     Time.zone = 'Alaska'
-    assert_equal TimeZone['Alaska'], Time.zone
+    assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
     Time.zone = -9.hours
-    assert_equal TimeZone['Alaska'], Time.zone
+    assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
     Time.zone = nil
     assert_equal nil, Time.zone
   end
-  
+
   def test_time_zone_getter_and_setter_with_zone_default
-    Time.zone_default = TimeZone['Alaska']
-    assert_equal TimeZone['Alaska'], Time.zone
-    Time.zone = TimeZone['Hawaii']
-    assert_equal TimeZone['Hawaii'], Time.zone
+    Time.zone_default = ActiveSupport::TimeZone['Alaska']
+    assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
+    Time.zone = ActiveSupport::TimeZone['Hawaii']
+    assert_equal ActiveSupport::TimeZone['Hawaii'], Time.zone
     Time.zone = nil
-    assert_equal TimeZone['Alaska'], Time.zone
+    assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
   ensure
     Time.zone_default = nil
   end
-  
+
   def test_time_zone_setter_is_thread_safe
     Time.use_zone 'Paris' do
       t1 = Thread.new { Time.zone = 'Alaska' }.join
       t2 = Thread.new { Time.zone = 'Hawaii' }.join
       assert t1.stop?, "Thread 1 did not finish running"
       assert t2.stop?, "Thread 2 did not finish running"
-      assert_equal TimeZone['Paris'], Time.zone
-      assert_equal TimeZone['Alaska'], t1[:time_zone]
-      assert_equal TimeZone['Hawaii'], t2[:time_zone]
+      assert_equal ActiveSupport::TimeZone['Paris'], Time.zone
+      assert_equal ActiveSupport::TimeZone['Alaska'], t1[:time_zone]
+      assert_equal ActiveSupport::TimeZone['Hawaii'], t2[:time_zone]
     end
   end
-  
+
   def test_time_zone_setter_with_tzinfo_timezone_object_wraps_in_rails_time_zone
     silence_warnings do # silence warnings raised by tzinfo gem
       tzinfo = TZInfo::Timezone.get('America/New_York')
       Time.zone = tzinfo
-      assert_kind_of TimeZone, Time.zone
+      assert_kind_of ActiveSupport::TimeZone, Time.zone
       assert_equal tzinfo, Time.zone.tzinfo
       assert_equal 'America/New_York', Time.zone.name
       assert_equal(-18_000, Time.zone.utc_offset)
     end
   end
-  
+
   def test_time_zone_setter_with_tzinfo_timezone_identifier_does_lookup_and_wraps_in_rails_time_zone
     silence_warnings do # silence warnings raised by tzinfo gem
       Time.zone = 'America/New_York'
-      assert_kind_of TimeZone, Time.zone
+      assert_kind_of ActiveSupport::TimeZone, Time.zone
       assert_equal 'America/New_York', Time.zone.tzinfo.name
       assert_equal 'America/New_York', Time.zone.name
       assert_equal(-18_000, Time.zone.utc_offset)
     end
   end
-  
+
   def test_time_zone_setter_with_non_identifying_argument_returns_nil
     Time.zone = 'foo'
     assert_equal nil, Time.zone
     Time.zone = -15.hours
     assert_equal nil, Time.zone
   end
-  
+
   uses_mocha 'TestTimeCurrent' do
     def test_current_returns_time_now_when_zone_default_not_set
       with_env_tz 'US/Eastern' do
@@ -650,10 +826,10 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
         assert_equal Time.local(2000), Time.current
       end
     end
-    
+
     def test_current_returns_time_zone_now_when_zone_default_set
       silence_warnings do # silence warnings raised by tzinfo gem
-        Time.zone_default = TimeZone['Eastern Time (US & Canada)']
+        Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
         with_env_tz 'US/Eastern' do
           Time.stubs(:now).returns Time.local(2000)
           assert_equal true, Time.current.is_a?(ActiveSupport::TimeWithZone)
@@ -665,7 +841,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
       Time.zone_default = nil
     end
   end
-  
+
   protected
     def with_env_tz(new_tz = 'US/Eastern')
       old_tz, ENV['TZ'] = ENV['TZ'], new_tz
diff --git a/vendor/rails/activesupport/test/dependencies_test.rb b/vendor/rails/activesupport/test/dependencies_test.rb
index 0309ab68..038547a8 100644
--- a/vendor/rails/activesupport/test/dependencies_test.rb
+++ b/vendor/rails/activesupport/test/dependencies_test.rb
@@ -15,31 +15,31 @@ end
 
 class DependenciesTest < Test::Unit::TestCase
   def teardown
-    Dependencies.clear
+    ActiveSupport::Dependencies.clear
   end
 
   def with_loading(*from)
-    old_mechanism, Dependencies.mechanism = Dependencies.mechanism, :load
+    old_mechanism, ActiveSupport::Dependencies.mechanism = ActiveSupport::Dependencies.mechanism, :load
     dir = File.dirname(__FILE__)
-    prior_load_paths = Dependencies.load_paths
-    Dependencies.load_paths = from.collect { |f| "#{dir}/#{f}" }
+    prior_load_paths = ActiveSupport::Dependencies.load_paths
+    ActiveSupport::Dependencies.load_paths = from.collect { |f| "#{dir}/#{f}" }
     yield
   ensure
-    Dependencies.load_paths = prior_load_paths
-    Dependencies.mechanism = old_mechanism
-    Dependencies.explicitly_unloadable_constants = []
+    ActiveSupport::Dependencies.load_paths = prior_load_paths
+    ActiveSupport::Dependencies.mechanism = old_mechanism
+    ActiveSupport::Dependencies.explicitly_unloadable_constants = []
   end
 
   def test_tracking_loaded_files
     require_dependency 'dependencies/service_one'
     require_dependency 'dependencies/service_two'
-    assert_equal 2, Dependencies.loaded.size
+    assert_equal 2, ActiveSupport::Dependencies.loaded.size
   end
 
   def test_tracking_identical_loaded_files
     require_dependency 'dependencies/service_one'
     require_dependency 'dependencies/service_one'
-    assert_equal 1, Dependencies.loaded.size
+    assert_equal 1, ActiveSupport::Dependencies.loaded.size
   end
 
   def test_missing_dependency_raises_missing_source_file
@@ -64,46 +64,46 @@ class DependenciesTest < Test::Unit::TestCase
         end
         assert_equal count + 1, $raises_exception_load_count
 
-        assert !Dependencies.loaded.include?(filename)
-        assert !Dependencies.history.include?(filename)
+        assert !ActiveSupport::Dependencies.loaded.include?(filename)
+        assert !ActiveSupport::Dependencies.history.include?(filename)
       end
     end
   end
 
   def test_warnings_should_be_enabled_on_first_load
     with_loading 'dependencies' do
-      old_warnings, Dependencies.warnings_on_first_load = Dependencies.warnings_on_first_load, true
+      old_warnings, ActiveSupport::Dependencies.warnings_on_first_load = ActiveSupport::Dependencies.warnings_on_first_load, true
 
       filename = "check_warnings"
       expanded = File.expand_path("test/dependencies/#{filename}")
       $check_warnings_load_count = 0
 
-      assert !Dependencies.loaded.include?(expanded)
-      assert !Dependencies.history.include?(expanded)
+      assert !ActiveSupport::Dependencies.loaded.include?(expanded)
+      assert !ActiveSupport::Dependencies.history.include?(expanded)
 
       silence_warnings { require_dependency filename }
       assert_equal 1, $check_warnings_load_count
       assert_equal true, $checked_verbose, 'On first load warnings should be enabled.'
 
-      assert Dependencies.loaded.include?(expanded)
-      Dependencies.clear
-      assert !Dependencies.loaded.include?(expanded)
-      assert Dependencies.history.include?(expanded)
+      assert ActiveSupport::Dependencies.loaded.include?(expanded)
+      ActiveSupport::Dependencies.clear
+      assert !ActiveSupport::Dependencies.loaded.include?(expanded)
+      assert ActiveSupport::Dependencies.history.include?(expanded)
 
       silence_warnings { require_dependency filename }
       assert_equal 2, $check_warnings_load_count
       assert_equal nil, $checked_verbose, 'After first load warnings should be left alone.'
 
-      assert Dependencies.loaded.include?(expanded)
-      Dependencies.clear
-      assert !Dependencies.loaded.include?(expanded)
-      assert Dependencies.history.include?(expanded)
+      assert ActiveSupport::Dependencies.loaded.include?(expanded)
+      ActiveSupport::Dependencies.clear
+      assert !ActiveSupport::Dependencies.loaded.include?(expanded)
+      assert ActiveSupport::Dependencies.history.include?(expanded)
 
       enable_warnings { require_dependency filename }
       assert_equal 3, $check_warnings_load_count
       assert_equal true, $checked_verbose, 'After first load warnings should be left alone.'
 
-      assert Dependencies.loaded.include?(expanded)
+      assert ActiveSupport::Dependencies.loaded.include?(expanded)
     end
   end
 
@@ -113,7 +113,7 @@ class DependenciesTest < Test::Unit::TestCase
       assert_nothing_raised { require_dependency 'mutual_one' }
       assert_equal 2, $mutual_dependencies_count
 
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
 
       $mutual_dependencies_count = 0
       assert_nothing_raised { require_dependency 'mutual_two' }
@@ -239,7 +239,7 @@ class DependenciesTest < Test::Unit::TestCase
   end
 
   def test_loadable_constants_for_path_should_handle_empty_autoloads
-    assert_equal [], Dependencies.loadable_constants_for_path('hello')
+    assert_equal [], ActiveSupport::Dependencies.loadable_constants_for_path('hello')
   end
 
   def test_loadable_constants_for_path_should_handle_relative_paths
@@ -247,7 +247,7 @@ class DependenciesTest < Test::Unit::TestCase
     relative_root = File.dirname(__FILE__) + '/dependencies'
     ['', '/'].each do |suffix|
       with_loading fake_root + suffix do
-        assert_equal ["A::B"], Dependencies.loadable_constants_for_path(relative_root + '/a/b')
+        assert_equal ["A::B"], ActiveSupport::Dependencies.loadable_constants_for_path(relative_root + '/a/b')
       end
     end
   end
@@ -255,106 +255,106 @@ class DependenciesTest < Test::Unit::TestCase
   def test_loadable_constants_for_path_should_provide_all_results
     fake_root = '/usr/apps/backpack'
     with_loading fake_root, fake_root + '/lib' do
-      root = Dependencies.load_paths.first
-      assert_equal ["Lib::A::B", "A::B"], Dependencies.loadable_constants_for_path(root + '/lib/a/b')
+      root = ActiveSupport::Dependencies.load_paths.first
+      assert_equal ["Lib::A::B", "A::B"], ActiveSupport::Dependencies.loadable_constants_for_path(root + '/lib/a/b')
     end
   end
 
   def test_loadable_constants_for_path_should_uniq_results
     fake_root = '/usr/apps/backpack/lib'
     with_loading fake_root, fake_root + '/' do
-      root = Dependencies.load_paths.first
-      assert_equal ["A::B"], Dependencies.loadable_constants_for_path(root + '/a/b')
+      root = ActiveSupport::Dependencies.load_paths.first
+      assert_equal ["A::B"], ActiveSupport::Dependencies.loadable_constants_for_path(root + '/a/b')
     end
   end
 
   def test_loadable_constants_with_load_path_without_trailing_slash
     path = File.dirname(__FILE__) + '/autoloading_fixtures/class_folder/inline_class.rb'
     with_loading 'autoloading_fixtures/class/' do
-      assert_equal [], Dependencies.loadable_constants_for_path(path)
+      assert_equal [], ActiveSupport::Dependencies.loadable_constants_for_path(path)
     end
   end
 
   def test_qualified_const_defined
-    assert Dependencies.qualified_const_defined?("Object")
-    assert Dependencies.qualified_const_defined?("::Object")
-    assert Dependencies.qualified_const_defined?("::Object::Kernel")
-    assert Dependencies.qualified_const_defined?("::Object::Dependencies")
-    assert Dependencies.qualified_const_defined?("::Test::Unit::TestCase")
+    assert ActiveSupport::Dependencies.qualified_const_defined?("Object")
+    assert ActiveSupport::Dependencies.qualified_const_defined?("::Object")
+    assert ActiveSupport::Dependencies.qualified_const_defined?("::Object::Kernel")
+    assert ActiveSupport::Dependencies.qualified_const_defined?("::Object::Dependencies")
+    assert ActiveSupport::Dependencies.qualified_const_defined?("::Test::Unit::TestCase")
   end
 
   def test_qualified_const_defined_should_not_call_method_missing
     ModuleWithMissing.missing_count = 0
-    assert ! Dependencies.qualified_const_defined?("ModuleWithMissing::A")
+    assert ! ActiveSupport::Dependencies.qualified_const_defined?("ModuleWithMissing::A")
     assert_equal 0, ModuleWithMissing.missing_count
-    assert ! Dependencies.qualified_const_defined?("ModuleWithMissing::A::B")
+    assert ! ActiveSupport::Dependencies.qualified_const_defined?("ModuleWithMissing::A::B")
     assert_equal 0, ModuleWithMissing.missing_count
   end
 
   def test_autoloaded?
     with_loading 'autoloading_fixtures' do
-      assert ! Dependencies.autoloaded?("ModuleFolder")
-      assert ! Dependencies.autoloaded?("ModuleFolder::NestedClass")
+      assert ! ActiveSupport::Dependencies.autoloaded?("ModuleFolder")
+      assert ! ActiveSupport::Dependencies.autoloaded?("ModuleFolder::NestedClass")
 
-      assert Dependencies.autoloaded?(ModuleFolder)
+      assert ActiveSupport::Dependencies.autoloaded?(ModuleFolder)
 
-      assert Dependencies.autoloaded?("ModuleFolder")
-      assert ! Dependencies.autoloaded?("ModuleFolder::NestedClass")
+      assert ActiveSupport::Dependencies.autoloaded?("ModuleFolder")
+      assert ! ActiveSupport::Dependencies.autoloaded?("ModuleFolder::NestedClass")
 
-      assert Dependencies.autoloaded?(ModuleFolder::NestedClass)
+      assert ActiveSupport::Dependencies.autoloaded?(ModuleFolder::NestedClass)
 
-      assert Dependencies.autoloaded?("ModuleFolder")
-      assert Dependencies.autoloaded?("ModuleFolder::NestedClass")
+      assert ActiveSupport::Dependencies.autoloaded?("ModuleFolder")
+      assert ActiveSupport::Dependencies.autoloaded?("ModuleFolder::NestedClass")
 
-      assert Dependencies.autoloaded?("::ModuleFolder")
-      assert Dependencies.autoloaded?(:ModuleFolder)
+      assert ActiveSupport::Dependencies.autoloaded?("::ModuleFolder")
+      assert ActiveSupport::Dependencies.autoloaded?(:ModuleFolder)
 
       # Anonymous modules aren't autoloaded.
-      assert !Dependencies.autoloaded?(Module.new)
+      assert !ActiveSupport::Dependencies.autoloaded?(Module.new)
 
       nil_name = Module.new
       def nil_name.name() nil end
-      assert !Dependencies.autoloaded?(nil_name)
+      assert !ActiveSupport::Dependencies.autoloaded?(nil_name)
 
       Object.class_eval { remove_const :ModuleFolder }
     end
   end
 
   def test_qualified_name_for
-    assert_equal "A", Dependencies.qualified_name_for(Object, :A)
-    assert_equal "A", Dependencies.qualified_name_for(:Object, :A)
-    assert_equal "A", Dependencies.qualified_name_for("Object", :A)
-    assert_equal "A", Dependencies.qualified_name_for("::Object", :A)
-    assert_equal "A", Dependencies.qualified_name_for("::Kernel", :A)
+    assert_equal "A", ActiveSupport::Dependencies.qualified_name_for(Object, :A)
+    assert_equal "A", ActiveSupport::Dependencies.qualified_name_for(:Object, :A)
+    assert_equal "A", ActiveSupport::Dependencies.qualified_name_for("Object", :A)
+    assert_equal "A", ActiveSupport::Dependencies.qualified_name_for("::Object", :A)
+    assert_equal "A", ActiveSupport::Dependencies.qualified_name_for("::Kernel", :A)
 
-    assert_equal "Dependencies::A", Dependencies.qualified_name_for(:Dependencies, :A)
-    assert_equal "Dependencies::A", Dependencies.qualified_name_for(Dependencies, :A)
+    assert_equal "ActiveSupport::Dependencies::A", ActiveSupport::Dependencies.qualified_name_for(:'ActiveSupport::Dependencies', :A)
+    assert_equal "ActiveSupport::Dependencies::A", ActiveSupport::Dependencies.qualified_name_for(ActiveSupport::Dependencies, :A)
   end
 
   def test_file_search
     with_loading 'dependencies' do
-      root = Dependencies.load_paths.first
-      assert_equal nil, Dependencies.search_for_file('service_three')
-      assert_equal nil, Dependencies.search_for_file('service_three.rb')
-      assert_equal root + '/service_one.rb', Dependencies.search_for_file('service_one')
-      assert_equal root + '/service_one.rb', Dependencies.search_for_file('service_one.rb')
+      root = ActiveSupport::Dependencies.load_paths.first
+      assert_equal nil, ActiveSupport::Dependencies.search_for_file('service_three')
+      assert_equal nil, ActiveSupport::Dependencies.search_for_file('service_three.rb')
+      assert_equal root + '/service_one.rb', ActiveSupport::Dependencies.search_for_file('service_one')
+      assert_equal root + '/service_one.rb', ActiveSupport::Dependencies.search_for_file('service_one.rb')
     end
   end
 
   def test_file_search_uses_first_in_load_path
     with_loading 'dependencies', 'autoloading_fixtures' do
-      deps, autoload = Dependencies.load_paths
+      deps, autoload = ActiveSupport::Dependencies.load_paths
       assert_match %r/dependencies/, deps
       assert_match %r/autoloading_fixtures/, autoload
 
-      assert_equal deps + '/conflict.rb', Dependencies.search_for_file('conflict')
+      assert_equal deps + '/conflict.rb', ActiveSupport::Dependencies.search_for_file('conflict')
     end
     with_loading 'autoloading_fixtures', 'dependencies' do
-      autoload, deps = Dependencies.load_paths
+      autoload, deps = ActiveSupport::Dependencies.load_paths
       assert_match %r/dependencies/, deps
       assert_match %r/autoloading_fixtures/, autoload
 
-      assert_equal autoload + '/conflict.rb', Dependencies.search_for_file('conflict')
+      assert_equal autoload + '/conflict.rb', ActiveSupport::Dependencies.search_for_file('conflict')
     end
 
   end
@@ -383,7 +383,7 @@ class DependenciesTest < Test::Unit::TestCase
     with_loading 'autoloading_fixtures' do
       require_dependency '././counting_loader'
       assert_equal 1, $counting_loaded_times
-      assert_raises(ArgumentError) { Dependencies.load_missing_constant Object, :CountingLoader }
+      assert_raises(ArgumentError) { ActiveSupport::Dependencies.load_missing_constant Object, :CountingLoader }
       assert_equal 1, $counting_loaded_times
     end
   end
@@ -407,12 +407,12 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_removal_from_tree_should_be_detected
     with_loading 'dependencies' do
-      root = Dependencies.load_paths.first
+      root = ActiveSupport::Dependencies.load_paths.first
       c = ServiceOne
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
       assert ! defined?(ServiceOne)
       begin
-        Dependencies.load_missing_constant(c, :FakeMissing)
+        ActiveSupport::Dependencies.load_missing_constant(c, :FakeMissing)
         flunk "Expected exception"
       rescue ArgumentError => e
         assert_match %r{ServiceOne has been removed from the module tree}i, e.message
@@ -430,25 +430,25 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_load_once_paths_do_not_add_to_autoloaded_constants
     with_loading 'autoloading_fixtures' do
-      Dependencies.load_once_paths = Dependencies.load_paths.dup
+      ActiveSupport::Dependencies.load_once_paths = ActiveSupport::Dependencies.load_paths.dup
 
-      assert ! Dependencies.autoloaded?("ModuleFolder")
-      assert ! Dependencies.autoloaded?("ModuleFolder::NestedClass")
-      assert ! Dependencies.autoloaded?(ModuleFolder)
+      assert ! ActiveSupport::Dependencies.autoloaded?("ModuleFolder")
+      assert ! ActiveSupport::Dependencies.autoloaded?("ModuleFolder::NestedClass")
+      assert ! ActiveSupport::Dependencies.autoloaded?(ModuleFolder)
 
       1 if ModuleFolder::NestedClass # 1 if to avoid warning
-      assert ! Dependencies.autoloaded?(ModuleFolder::NestedClass)
+      assert ! ActiveSupport::Dependencies.autoloaded?(ModuleFolder::NestedClass)
     end
   ensure
     Object.class_eval { remove_const :ModuleFolder }
-    Dependencies.load_once_paths = []
+    ActiveSupport::Dependencies.load_once_paths = []
   end
 
   def test_application_should_special_case_application_controller
     with_loading 'autoloading_fixtures' do
       require_dependency 'application'
       assert_equal 10, ApplicationController
-      assert Dependencies.autoloaded?(:ApplicationController)
+      assert ActiveSupport::Dependencies.autoloaded?(:ApplicationController)
     end
   end
 
@@ -463,15 +463,15 @@ class DependenciesTest < Test::Unit::TestCase
   def test_preexisting_constants_are_not_marked_as_autoloaded
     with_loading 'autoloading_fixtures' do
       require_dependency 'e'
-      assert Dependencies.autoloaded?(:E)
-      Dependencies.clear
+      assert ActiveSupport::Dependencies.autoloaded?(:E)
+      ActiveSupport::Dependencies.clear
     end
 
     Object.const_set :E, Class.new
     with_loading 'autoloading_fixtures' do
       require_dependency 'e'
-      assert ! Dependencies.autoloaded?(:E), "E shouldn't be marked autoloaded!"
-      Dependencies.clear
+      assert ! ActiveSupport::Dependencies.autoloaded?(:E), "E shouldn't be marked autoloaded!"
+      ActiveSupport::Dependencies.clear
     end
 
   ensure
@@ -483,11 +483,11 @@ class DependenciesTest < Test::Unit::TestCase
       Object.const_set :M, Module.new
       M.unloadable
 
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
       assert ! defined?(M)
 
       Object.const_set :M, Module.new
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
       assert ! defined?(M), "Dependencies should unload unloadable constants each time"
     end
   end
@@ -508,24 +508,24 @@ class DependenciesTest < Test::Unit::TestCase
   end
 
   def test_new_contants_in_without_constants
-    assert_equal [], (Dependencies.new_constants_in(Object) { })
-    assert Dependencies.constant_watch_stack.empty?
+    assert_equal [], (ActiveSupport::Dependencies.new_constants_in(Object) { })
+    assert ActiveSupport::Dependencies.constant_watch_stack.empty?
   end
 
   def test_new_constants_in_with_a_single_constant
-    assert_equal ["Hello"], Dependencies.new_constants_in(Object) {
+    assert_equal ["Hello"], ActiveSupport::Dependencies.new_constants_in(Object) {
                               Object.const_set :Hello, 10
                             }.map(&:to_s)
-    assert Dependencies.constant_watch_stack.empty?
+    assert ActiveSupport::Dependencies.constant_watch_stack.empty?
   ensure
     Object.class_eval { remove_const :Hello }
   end
 
   def test_new_constants_in_with_nesting
-    outer = Dependencies.new_constants_in(Object) do
+    outer = ActiveSupport::Dependencies.new_constants_in(Object) do
       Object.const_set :OuterBefore, 10
 
-      assert_equal ["Inner"], Dependencies.new_constants_in(Object) {
+      assert_equal ["Inner"], ActiveSupport::Dependencies.new_constants_in(Object) {
                                 Object.const_set :Inner, 20
                               }.map(&:to_s)
 
@@ -533,7 +533,7 @@ class DependenciesTest < Test::Unit::TestCase
     end
 
     assert_equal ["OuterAfter", "OuterBefore"], outer.sort.map(&:to_s)
-    assert Dependencies.constant_watch_stack.empty?
+    assert ActiveSupport::Dependencies.constant_watch_stack.empty?
   ensure
     %w(OuterBefore Inner OuterAfter).each do |name|
       Object.class_eval { remove_const name if const_defined?(name) }
@@ -543,10 +543,10 @@ class DependenciesTest < Test::Unit::TestCase
   def test_new_constants_in_module
     Object.const_set :M, Module.new
 
-    outer = Dependencies.new_constants_in(M) do
+    outer = ActiveSupport::Dependencies.new_constants_in(M) do
       M.const_set :OuterBefore, 10
 
-      inner = Dependencies.new_constants_in(M) do
+      inner = ActiveSupport::Dependencies.new_constants_in(M) do
         M.const_set :Inner, 20
       end
       assert_equal ["M::Inner"], inner
@@ -554,17 +554,17 @@ class DependenciesTest < Test::Unit::TestCase
       M.const_set :OuterAfter, 30
     end
     assert_equal ["M::OuterAfter", "M::OuterBefore"], outer.sort
-    assert Dependencies.constant_watch_stack.empty?
+    assert ActiveSupport::Dependencies.constant_watch_stack.empty?
   ensure
     Object.class_eval { remove_const :M }
   end
 
   def test_new_constants_in_module_using_name
-    outer = Dependencies.new_constants_in(:M) do
+    outer = ActiveSupport::Dependencies.new_constants_in(:M) do
       Object.const_set :M, Module.new
       M.const_set :OuterBefore, 10
 
-      inner = Dependencies.new_constants_in(:M) do
+      inner = ActiveSupport::Dependencies.new_constants_in(:M) do
         M.const_set :Inner, 20
       end
       assert_equal ["M::Inner"], inner
@@ -572,13 +572,13 @@ class DependenciesTest < Test::Unit::TestCase
       M.const_set :OuterAfter, 30
     end
     assert_equal ["M::OuterAfter", "M::OuterBefore"], outer.sort
-    assert Dependencies.constant_watch_stack.empty?
+    assert ActiveSupport::Dependencies.constant_watch_stack.empty?
   ensure
     Object.class_eval { remove_const :M }
   end
 
   def test_new_constants_in_with_inherited_constants
-    m = Dependencies.new_constants_in(:Object) do
+    m = ActiveSupport::Dependencies.new_constants_in(:Object) do
       Object.class_eval { include ModuleWithConstant }
     end
     assert_equal [], m
@@ -586,7 +586,7 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_new_constants_in_with_illegal_module_name_raises_correct_error
     assert_raises(NameError) do
-      Dependencies.new_constants_in("Illegal-Name") {}
+      ActiveSupport::Dependencies.new_constants_in("Illegal-Name") {}
     end
   end
 
@@ -598,10 +598,10 @@ class DependenciesTest < Test::Unit::TestCase
       require_dependency 'multiple_constant_file'
       assert defined?(MultipleConstantFile)
       assert defined?(SiblingConstant)
-      assert Dependencies.autoloaded?(:MultipleConstantFile)
-      assert Dependencies.autoloaded?(:SiblingConstant)
+      assert ActiveSupport::Dependencies.autoloaded?(:MultipleConstantFile)
+      assert ActiveSupport::Dependencies.autoloaded?(:SiblingConstant)
 
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
 
       assert ! defined?(MultipleConstantFile)
       assert ! defined?(SiblingConstant)
@@ -617,10 +617,10 @@ class DependenciesTest < Test::Unit::TestCase
 
       assert defined?(MultipleConstantFile)
       assert defined?(SiblingConstant)
-      assert Dependencies.autoloaded?(:MultipleConstantFile)
-      assert Dependencies.autoloaded?(:SiblingConstant)
+      assert ActiveSupport::Dependencies.autoloaded?(:MultipleConstantFile)
+      assert ActiveSupport::Dependencies.autoloaded?(:SiblingConstant)
 
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
 
       assert ! defined?(MultipleConstantFile)
       assert ! defined?(SiblingConstant)
@@ -636,10 +636,10 @@ class DependenciesTest < Test::Unit::TestCase
 
       assert defined?(ClassFolder::NestedClass)
       assert defined?(ClassFolder::SiblingClass)
-      assert Dependencies.autoloaded?("ClassFolder::NestedClass")
-      assert Dependencies.autoloaded?("ClassFolder::SiblingClass")
+      assert ActiveSupport::Dependencies.autoloaded?("ClassFolder::NestedClass")
+      assert ActiveSupport::Dependencies.autoloaded?("ClassFolder::SiblingClass")
 
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
 
       assert ! defined?(ClassFolder::NestedClass)
       assert ! defined?(ClassFolder::SiblingClass)
@@ -655,10 +655,10 @@ class DependenciesTest < Test::Unit::TestCase
 
       assert defined?(ClassFolder::NestedClass)
       assert defined?(ClassFolder::SiblingClass)
-      assert Dependencies.autoloaded?("ClassFolder::NestedClass")
-      assert Dependencies.autoloaded?("ClassFolder::SiblingClass")
+      assert ActiveSupport::Dependencies.autoloaded?("ClassFolder::NestedClass")
+      assert ActiveSupport::Dependencies.autoloaded?("ClassFolder::SiblingClass")
 
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
 
       assert ! defined?(ClassFolder::NestedClass)
       assert ! defined?(ClassFolder::SiblingClass)
@@ -693,7 +693,7 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_autoload_doesnt_shadow_error_when_mechanism_not_set_to_load
     with_loading 'autoloading_fixtures' do
-      Dependencies.mechanism = :require
+      ActiveSupport::Dependencies.mechanism = :require
       2.times do
         assert_raise(NameError) {"RaisesNameError".constantize}
       end
@@ -727,39 +727,39 @@ class DependenciesTest < Test::Unit::TestCase
   def test_remove_constant_handles_double_colon_at_start
     Object.const_set 'DeleteMe', Module.new
     DeleteMe.const_set 'OrMe', Module.new
-    Dependencies.remove_constant "::DeleteMe::OrMe"
+    ActiveSupport::Dependencies.remove_constant "::DeleteMe::OrMe"
     assert ! defined?(DeleteMe::OrMe)
     assert defined?(DeleteMe)
-    Dependencies.remove_constant "::DeleteMe"
+    ActiveSupport::Dependencies.remove_constant "::DeleteMe"
     assert ! defined?(DeleteMe)
   end
 
   def test_load_once_constants_should_not_be_unloaded
     with_loading 'autoloading_fixtures' do
-      Dependencies.load_once_paths = Dependencies.load_paths
+      ActiveSupport::Dependencies.load_once_paths = ActiveSupport::Dependencies.load_paths
       ::A.to_s
       assert defined?(A)
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
       assert defined?(A)
     end
   ensure
-    Dependencies.load_once_paths = []
+    ActiveSupport::Dependencies.load_once_paths = []
     Object.class_eval { remove_const :A if const_defined?(:A) }
   end
 
   def test_load_once_paths_should_behave_when_recursively_loading
     with_loading 'dependencies', 'autoloading_fixtures' do
-      Dependencies.load_once_paths = [Dependencies.load_paths.last]
+      ActiveSupport::Dependencies.load_once_paths = [ActiveSupport::Dependencies.load_paths.last]
       assert !defined?(CrossSiteDependency)
       assert_nothing_raised { CrossSiteDepender.nil? }
       assert defined?(CrossSiteDependency)
-      assert !Dependencies.autoloaded?(CrossSiteDependency),
+      assert !ActiveSupport::Dependencies.autoloaded?(CrossSiteDependency),
         "CrossSiteDependency shouldn't be marked as autoloaded!"
-      Dependencies.clear
+      ActiveSupport::Dependencies.clear
       assert defined?(CrossSiteDependency),
         "CrossSiteDependency shouldn't have been unloaded!"
     end
   ensure
-    Dependencies.load_once_paths = []
+    ActiveSupport::Dependencies.load_once_paths = []
   end
 end
diff --git a/vendor/rails/activesupport/test/deprecation_test.rb b/vendor/rails/activesupport/test/deprecation_test.rb
index ebfa4059..27e9573c 100644
--- a/vendor/rails/activesupport/test/deprecation_test.rb
+++ b/vendor/rails/activesupport/test/deprecation_test.rb
@@ -24,6 +24,11 @@ class Deprecatee
   def d; end
   def e; end
   deprecate :a, :b, :c => :e, :d => "you now need to do something extra for this one"
+
+  module B
+    C = 1
+  end
+  A = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Deprecatee::A', 'Deprecatee::B::C')
 end
 
 
@@ -83,6 +88,11 @@ class DeprecationTest < Test::Unit::TestCase
     assert_not_deprecated { assert_equal @dtc.request.inspect, @dtc.old_request.inspect }
   end
 
+  def test_deprecated_constant_proxy
+    assert_not_deprecated { Deprecatee::B::C }
+    assert_deprecated('Deprecatee::A') { assert_equal Deprecatee::B::C, Deprecatee::A }
+  end
+
   def test_assert_deprecation_without_match
     assert_deprecated do
       @dtc.partially
diff --git a/vendor/rails/activesupport/test/gzip_test.rb b/vendor/rails/activesupport/test/gzip_test.rb
new file mode 100644
index 00000000..2a24c0bd
--- /dev/null
+++ b/vendor/rails/activesupport/test/gzip_test.rb
@@ -0,0 +1,7 @@
+require 'abstract_unit'
+
+class GzipTest < Test::Unit::TestCase
+  def test_compress_should_decompress_to_the_same_value
+    assert_equal "Hello World", ActiveSupport::Gzip.decompress(ActiveSupport::Gzip.compress("Hello World"))
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/activesupport/test/inflector_test.rb b/vendor/rails/activesupport/test/inflector_test.rb
index 26af245f..4ce9cbb7 100644
--- a/vendor/rails/activesupport/test/inflector_test.rb
+++ b/vendor/rails/activesupport/test/inflector_test.rb
@@ -12,188 +12,188 @@ class InflectorTest < Test::Unit::TestCase
   include InflectorTestCases
 
   def test_pluralize_plurals
-    assert_equal "plurals", Inflector.pluralize("plurals")
-    assert_equal "Plurals", Inflector.pluralize("Plurals")
+    assert_equal "plurals", ActiveSupport::Inflector.pluralize("plurals")
+    assert_equal "Plurals", ActiveSupport::Inflector.pluralize("Plurals")
   end
 
   def test_pluralize_empty_string
-    assert_equal "", Inflector.pluralize("")
+    assert_equal "", ActiveSupport::Inflector.pluralize("")
   end
 
   SingularToPlural.each do |singular, plural|
     define_method "test_pluralize_#{singular}" do
-      assert_equal(plural, Inflector.pluralize(singular))
-      assert_equal(plural.capitalize, Inflector.pluralize(singular.capitalize))
+      assert_equal(plural, ActiveSupport::Inflector.pluralize(singular))
+      assert_equal(plural.capitalize, ActiveSupport::Inflector.pluralize(singular.capitalize))
     end
   end
 
   SingularToPlural.each do |singular, plural|
     define_method "test_singularize_#{plural}" do
-      assert_equal(singular, Inflector.singularize(plural))
-      assert_equal(singular.capitalize, Inflector.singularize(plural.capitalize))
+      assert_equal(singular, ActiveSupport::Inflector.singularize(plural))
+      assert_equal(singular.capitalize, ActiveSupport::Inflector.singularize(plural.capitalize))
     end
   end
 
   MixtureToTitleCase.each do |before, titleized|
     define_method "test_titleize_#{before}" do
-      assert_equal(titleized, Inflector.titleize(before))
+      assert_equal(titleized, ActiveSupport::Inflector.titleize(before))
     end
   end
 
   def test_camelize
     CamelToUnderscore.each do |camel, underscore|
-      assert_equal(camel, Inflector.camelize(underscore))
+      assert_equal(camel, ActiveSupport::Inflector.camelize(underscore))
     end
   end
 
   def test_underscore
     CamelToUnderscore.each do |camel, underscore|
-      assert_equal(underscore, Inflector.underscore(camel))
+      assert_equal(underscore, ActiveSupport::Inflector.underscore(camel))
     end
     CamelToUnderscoreWithoutReverse.each do |camel, underscore|
-      assert_equal(underscore, Inflector.underscore(camel))
+      assert_equal(underscore, ActiveSupport::Inflector.underscore(camel))
     end
   end
 
   def test_camelize_with_module
     CamelWithModuleToUnderscoreWithSlash.each do |camel, underscore|
-      assert_equal(camel, Inflector.camelize(underscore))
+      assert_equal(camel, ActiveSupport::Inflector.camelize(underscore))
     end
   end
 
   def test_underscore_with_slashes
     CamelWithModuleToUnderscoreWithSlash.each do |camel, underscore|
-      assert_equal(underscore, Inflector.underscore(camel))
+      assert_equal(underscore, ActiveSupport::Inflector.underscore(camel))
     end
   end
 
   def test_demodulize
-    assert_equal "Account", Inflector.demodulize("MyApplication::Billing::Account")
+    assert_equal "Account", ActiveSupport::Inflector.demodulize("MyApplication::Billing::Account")
   end
 
   def test_foreign_key
     ClassNameToForeignKeyWithUnderscore.each do |klass, foreign_key|
-      assert_equal(foreign_key, Inflector.foreign_key(klass))
+      assert_equal(foreign_key, ActiveSupport::Inflector.foreign_key(klass))
     end
 
     ClassNameToForeignKeyWithoutUnderscore.each do |klass, foreign_key|
-      assert_equal(foreign_key, Inflector.foreign_key(klass, false))
+      assert_equal(foreign_key, ActiveSupport::Inflector.foreign_key(klass, false))
     end
   end
 
   def test_tableize
     ClassNameToTableName.each do |class_name, table_name|
-      assert_equal(table_name, Inflector.tableize(class_name))
+      assert_equal(table_name, ActiveSupport::Inflector.tableize(class_name))
     end
   end
 
   def test_classify
     ClassNameToTableName.each do |class_name, table_name|
-      assert_equal(class_name, Inflector.classify(table_name))
-      assert_equal(class_name, Inflector.classify("table_prefix." + table_name))
+      assert_equal(class_name, ActiveSupport::Inflector.classify(table_name))
+      assert_equal(class_name, ActiveSupport::Inflector.classify("table_prefix." + table_name))
     end
   end
 
   def test_classify_with_symbol
     assert_nothing_raised do
-      assert_equal 'FooBar', Inflector.classify(:foo_bars)
+      assert_equal 'FooBar', ActiveSupport::Inflector.classify(:foo_bars)
     end
   end
 
   def test_classify_with_leading_schema_name
-    assert_equal 'FooBar', Inflector.classify('schema.foo_bar')
+    assert_equal 'FooBar', ActiveSupport::Inflector.classify('schema.foo_bar')
   end
 
   def test_humanize
     UnderscoreToHuman.each do |underscore, human|
-      assert_equal(human, Inflector.humanize(underscore))
+      assert_equal(human, ActiveSupport::Inflector.humanize(underscore))
     end
   end
 
   def test_constantize
-    assert_nothing_raised { assert_equal Ace::Base::Case, Inflector.constantize("Ace::Base::Case") }
-    assert_nothing_raised { assert_equal Ace::Base::Case, Inflector.constantize("::Ace::Base::Case") }
-    assert_nothing_raised { assert_equal InflectorTest, Inflector.constantize("InflectorTest") }
-    assert_nothing_raised { assert_equal InflectorTest, Inflector.constantize("::InflectorTest") }
-    assert_raises(NameError) { Inflector.constantize("UnknownClass") }
-    assert_raises(NameError) { Inflector.constantize("An invalid string") }
-    assert_raises(NameError) { Inflector.constantize("InvalidClass\n") }
+    assert_nothing_raised { assert_equal Ace::Base::Case, ActiveSupport::Inflector.constantize("Ace::Base::Case") }
+    assert_nothing_raised { assert_equal Ace::Base::Case, ActiveSupport::Inflector.constantize("::Ace::Base::Case") }
+    assert_nothing_raised { assert_equal InflectorTest, ActiveSupport::Inflector.constantize("InflectorTest") }
+    assert_nothing_raised { assert_equal InflectorTest, ActiveSupport::Inflector.constantize("::InflectorTest") }
+    assert_raises(NameError) { ActiveSupport::Inflector.constantize("UnknownClass") }
+    assert_raises(NameError) { ActiveSupport::Inflector.constantize("An invalid string") }
+    assert_raises(NameError) { ActiveSupport::Inflector.constantize("InvalidClass\n") }
   end
 
   def test_constantize_does_lexical_lookup
-    assert_raises(NameError) { Inflector.constantize("Ace::Base::InflectorTest") }
+    assert_raises(NameError) { ActiveSupport::Inflector.constantize("Ace::Base::InflectorTest") }
   end
 
   def test_ordinal
     OrdinalNumbers.each do |number, ordinalized|
-      assert_equal(ordinalized, Inflector.ordinalize(number))
+      assert_equal(ordinalized, ActiveSupport::Inflector.ordinalize(number))
     end
   end
 
   def test_dasherize
     UnderscoresToDashes.each do |underscored, dasherized|
-      assert_equal(dasherized, Inflector.dasherize(underscored))
+      assert_equal(dasherized, ActiveSupport::Inflector.dasherize(underscored))
     end
   end
 
   def test_underscore_as_reverse_of_dasherize
     UnderscoresToDashes.each do |underscored, dasherized|
-      assert_equal(underscored, Inflector.underscore(Inflector.dasherize(underscored)))
+      assert_equal(underscored, ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.dasherize(underscored)))
     end
   end
 
   def test_underscore_to_lower_camel
     UnderscoreToLowerCamel.each do |underscored, lower_camel|
-      assert_equal(lower_camel, Inflector.camelize(underscored, false))
+      assert_equal(lower_camel, ActiveSupport::Inflector.camelize(underscored, false))
     end
   end
-  
+
   %w{plurals singulars uncountables}.each do |inflection_type|
     class_eval "
       def test_clear_#{inflection_type}
-        cached_values = Inflector.inflections.#{inflection_type}
-        Inflector.inflections.clear :#{inflection_type}
-        assert Inflector.inflections.#{inflection_type}.empty?, \"#{inflection_type} inflections should be empty after clear :#{inflection_type}\"
-        Inflector.inflections.instance_variable_set :@#{inflection_type}, cached_values
+        cached_values = ActiveSupport::Inflector.inflections.#{inflection_type}
+        ActiveSupport::Inflector.inflections.clear :#{inflection_type}
+        assert ActiveSupport::Inflector.inflections.#{inflection_type}.empty?, \"#{inflection_type} inflections should be empty after clear :#{inflection_type}\"
+        ActiveSupport::Inflector.inflections.instance_variable_set :@#{inflection_type}, cached_values
       end
     "
   end
-  
+
   def test_clear_all
-    cached_values = Inflector.inflections.plurals, Inflector.inflections.singulars, Inflector.inflections.uncountables
-    Inflector.inflections.clear :all
-    assert Inflector.inflections.plurals.empty?
-    assert Inflector.inflections.singulars.empty?
-    assert Inflector.inflections.uncountables.empty?
-    Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
-    Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
-    Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
+    cached_values = ActiveSupport::Inflector.inflections.plurals, ActiveSupport::Inflector.inflections.singulars, ActiveSupport::Inflector.inflections.uncountables
+    ActiveSupport::Inflector.inflections.clear :all
+    assert ActiveSupport::Inflector.inflections.plurals.empty?
+    assert ActiveSupport::Inflector.inflections.singulars.empty?
+    assert ActiveSupport::Inflector.inflections.uncountables.empty?
+    ActiveSupport::Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
+    ActiveSupport::Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
+    ActiveSupport::Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
   end
-  
+
   def test_clear_with_default
-    cached_values = Inflector.inflections.plurals, Inflector.inflections.singulars, Inflector.inflections.uncountables
-    Inflector.inflections.clear
-    assert Inflector.inflections.plurals.empty?
-    assert Inflector.inflections.singulars.empty?
-    assert Inflector.inflections.uncountables.empty?
-    Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
-    Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
-    Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
+    cached_values = ActiveSupport::Inflector.inflections.plurals, ActiveSupport::Inflector.inflections.singulars, ActiveSupport::Inflector.inflections.uncountables
+    ActiveSupport::Inflector.inflections.clear
+    assert ActiveSupport::Inflector.inflections.plurals.empty?
+    assert ActiveSupport::Inflector.inflections.singulars.empty?
+    assert ActiveSupport::Inflector.inflections.uncountables.empty?
+    ActiveSupport::Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
+    ActiveSupport::Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
+    ActiveSupport::Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
   end
 
   Irregularities.each do |irregularity|
     singular, plural = *irregularity
-    Inflector.inflections do |inflect|
+    ActiveSupport::Inflector.inflections do |inflect|
       define_method("test_irregularity_between_#{singular}_and_#{plural}") do
         inflect.irregular(singular, plural)
-        assert_equal singular, Inflector.singularize(plural)
-        assert_equal plural, Inflector.pluralize(singular)
+        assert_equal singular, ActiveSupport::Inflector.singularize(plural)
+        assert_equal plural, ActiveSupport::Inflector.pluralize(singular)
       end
     end
   end
 
   [ :all, [] ].each do |scope|
-    Inflector.inflections do |inflect|
+    ActiveSupport::Inflector.inflections do |inflect|
       define_method("test_clear_inflections_with_#{scope.kind_of?(Array) ? "no_arguments" : scope}") do
         # save all the inflections
         singulars, plurals, uncountables = inflect.singulars, inflect.plurals, inflect.uncountables
@@ -218,7 +218,7 @@ class InflectorTest < Test::Unit::TestCase
   end
 
   { :singulars => :singular, :plurals => :plural, :uncountables => :uncountable }.each do |scope, method|
-    Inflector.inflections do |inflect|
+    ActiveSupport::Inflector.inflections do |inflect|
       define_method("test_clear_inflections_with_#{scope}") do
         # save the inflections
         values = inflect.send(scope)
diff --git a/vendor/rails/activesupport/test/ordered_options_test.rb b/vendor/rails/activesupport/test/ordered_options_test.rb
index fb7a58d0..e48425ca 100644
--- a/vendor/rails/activesupport/test/ordered_options_test.rb
+++ b/vendor/rails/activesupport/test/ordered_options_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 class OrderedOptionsTest < Test::Unit::TestCase
   def test_usage
-    a = OrderedOptions.new
+    a = ActiveSupport::OrderedOptions.new
 
     assert_nil a[:not_set]
 
@@ -20,7 +20,7 @@ class OrderedOptionsTest < Test::Unit::TestCase
   end
 
   def test_looping
-    a = OrderedOptions.new
+    a = ActiveSupport::OrderedOptions.new
 
     a[:allow_concurreny] = true
     a["else_where"] = 56
@@ -34,7 +34,7 @@ class OrderedOptionsTest < Test::Unit::TestCase
   end
 
   def test_method_access
-    a = OrderedOptions.new
+    a = ActiveSupport::OrderedOptions.new
 
     assert_nil a.not_set
 
diff --git a/vendor/rails/activesupport/test/string_inquirer_test.rb b/vendor/rails/activesupport/test/string_inquirer_test.rb
new file mode 100644
index 00000000..fbb1b2bf
--- /dev/null
+++ b/vendor/rails/activesupport/test/string_inquirer_test.rb
@@ -0,0 +1,15 @@
+require 'abstract_unit'
+
+class StringInquirerTest < Test::Unit::TestCase
+  def test_match
+    assert ActiveSupport::StringInquirer.new("production").production?
+  end
+  
+  def test_miss
+    assert !ActiveSupport::StringInquirer.new("production").development?
+  end
+
+  def test_missing_question_mark
+    assert_raises(NoMethodError) { ActiveSupport::StringInquirer.new("production").production }
+  end
+end
diff --git a/vendor/rails/activesupport/test/time_zone_test.rb b/vendor/rails/activesupport/test/time_zone_test.rb
index f3069b58..b42dcd17 100644
--- a/vendor/rails/activesupport/test/time_zone_test.rb
+++ b/vendor/rails/activesupport/test/time_zone_test.rb
@@ -1,10 +1,9 @@
 require 'abstract_unit'
 
 class TimeZoneTest < Test::Unit::TestCase
-    
   def test_utc_to_local
     silence_warnings do # silence warnings raised by tzinfo gem
-      zone = TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
       assert_equal Time.utc(1999, 12, 31, 19), zone.utc_to_local(Time.utc(2000, 1)) # standard offset -0500
       assert_equal Time.utc(2000, 6, 30, 20), zone.utc_to_local(Time.utc(2000, 7)) # dst offset -0400
     end
@@ -12,41 +11,41 @@ class TimeZoneTest < Test::Unit::TestCase
 
   def test_local_to_utc
     silence_warnings do # silence warnings raised by tzinfo gem
-      zone = TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
       assert_equal Time.utc(2000, 1, 1, 5), zone.local_to_utc(Time.utc(2000, 1)) # standard offset -0500
       assert_equal Time.utc(2000, 7, 1, 4), zone.local_to_utc(Time.utc(2000, 7)) # dst offset -0400
     end
   end
-  
+
   def test_period_for_local
     silence_warnings do # silence warnings raised by tzinfo gem
-      zone = TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
       assert_instance_of TZInfo::TimezonePeriod, zone.period_for_local(Time.utc(2000))
     end
   end
-  
-  TimeZone::MAPPING.keys.each do |name|
+
+  ActiveSupport::TimeZone::MAPPING.keys.each do |name|
     define_method("test_map_#{name.downcase.gsub(/[^a-z]/, '_')}_to_tzinfo") do
       silence_warnings do # silence warnings raised by tzinfo gem
-        zone = TimeZone[name]
+        zone = ActiveSupport::TimeZone[name]
         assert zone.tzinfo.respond_to?(:period_for_local)
       end
     end
   end
 
   def test_from_integer_to_map
-    assert_instance_of TimeZone, TimeZone[-28800] # PST
+    assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[-28800] # PST
   end
 
   def test_from_duration_to_map
-    assert_instance_of TimeZone, TimeZone[-480.minutes] # PST
+    assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[-480.minutes] # PST
   end
 
-  TimeZone.all.each do |zone|
+  ActiveSupport::TimeZone.all.each do |zone|
     name = zone.name.downcase.gsub(/[^a-z]/, '_')
     define_method("test_from_#{name}_to_map") do
       silence_warnings do # silence warnings raised by tzinfo gem
-        assert_instance_of TimeZone, TimeZone[zone.name]
+        assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[zone.name]
       end
     end
 
@@ -62,62 +61,62 @@ class TimeZoneTest < Test::Unit::TestCase
     def test_now
       with_env_tz 'US/Eastern' do
         Time.stubs(:now).returns(Time.local(2000))
-        zone = TimeZone['Eastern Time (US & Canada)']
+        zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
         assert_instance_of ActiveSupport::TimeWithZone, zone.now
         assert_equal Time.utc(2000,1,1,5), zone.now.utc
         assert_equal Time.utc(2000), zone.now.time
         assert_equal zone, zone.now.time_zone
       end
     end
-    
+
     def test_now_enforces_spring_dst_rules
       with_env_tz 'US/Eastern' do
         Time.stubs(:now).returns(Time.local(2006,4,2,2)) # 2AM springs forward to 3AM
-        zone = TimeZone['Eastern Time (US & Canada)']
+        zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
         assert_equal Time.utc(2006,4,2,3), zone.now.time
         assert_equal true, zone.now.dst?
       end
     end
-    
+
     def test_now_enforces_fall_dst_rules
       with_env_tz 'US/Eastern' do
         Time.stubs(:now).returns(Time.at(1162098000)) # equivalent to 1AM DST
-        zone = TimeZone['Eastern Time (US & Canada)']
+        zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
         assert_equal Time.utc(2006,10,29,1), zone.now.time
         assert_equal true, zone.now.dst?
       end
     end
-  
+
     def test_today
       Time.stubs(:now).returns(Time.utc(2000, 1, 1, 4, 59, 59)) # 1 sec before midnight Jan 1 EST
-      assert_equal Date.new(1999, 12, 31), TimeZone['Eastern Time (US & Canada)'].today
+      assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
       Time.stubs(:now).returns(Time.utc(2000, 1, 1, 5)) # midnight Jan 1 EST
-      assert_equal Date.new(2000, 1, 1), TimeZone['Eastern Time (US & Canada)'].today
+      assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
       Time.stubs(:now).returns(Time.utc(2000, 1, 2, 4, 59, 59)) # 1 sec before midnight Jan 2 EST
-      assert_equal Date.new(2000, 1, 1), TimeZone['Eastern Time (US & Canada)'].today
+      assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
       Time.stubs(:now).returns(Time.utc(2000, 1, 2, 5)) # midnight Jan 2 EST
-      assert_equal Date.new(2000, 1, 2), TimeZone['Eastern Time (US & Canada)'].today
+      assert_equal Date.new(2000, 1, 2), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
     end
   end
-  
+
   def test_local
     silence_warnings do # silence warnings raised by tzinfo gem
-      time = TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45)
+      time = ActiveSupport::TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45)
       assert_equal Time.utc(2007, 2, 5, 15, 30, 45), time.time
-      assert_equal TimeZone["Hawaii"], time.time_zone
+      assert_equal ActiveSupport::TimeZone["Hawaii"], time.time_zone
     end
   end
 
   def test_local_with_old_date
     silence_warnings do # silence warnings raised by tzinfo gem
-      time = TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45)
+      time = ActiveSupport::TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45)
       assert_equal [45,30,15,5,2,1850], time.to_a[0,6]
-      assert_equal TimeZone["Hawaii"], time.time_zone
+      assert_equal ActiveSupport::TimeZone["Hawaii"], time.time_zone
     end
   end
 
   def test_local_enforces_spring_dst_rules
-    zone = TimeZone['Eastern Time (US & Canada)']
+    zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     twz = zone.local(2006,4,2,1,59,59) # 1 second before DST start
     assert_equal Time.utc(2006,4,2,1,59,59), twz.time
     assert_equal Time.utc(2006,4,2,6,59,59), twz.utc
@@ -138,16 +137,16 @@ class TimeZoneTest < Test::Unit::TestCase
   def test_local_enforces_fall_dst_rules
     # 1AM during fall DST transition is ambiguous, it could be either DST or non-DST 1AM
     # Mirroring Time.local behavior, this method selects the DST time
-    zone = TimeZone['Eastern Time (US & Canada)']
+    zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     twz = zone.local(2006,10,29,1)
     assert_equal Time.utc(2006,10,29,1), twz.time
     assert_equal Time.utc(2006,10,29,5), twz.utc
-    assert_equal true, twz.dst? 
+    assert_equal true, twz.dst?
     assert_equal 'EDT', twz.zone
   end
 
   def test_at
-    zone = TimeZone['Eastern Time (US & Canada)']
+    zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     secs = 946684800.0
     twz = zone.at(secs)
     assert_equal Time.utc(1999,12,31,19), twz.time
@@ -157,7 +156,7 @@ class TimeZoneTest < Test::Unit::TestCase
   end
 
   def test_at_with_old_date
-    zone = TimeZone['Eastern Time (US & Canada)']
+    zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     secs = DateTime.civil(1850).to_f
     twz = zone.at(secs)
     assert_equal [1850, 1, 1, 0], [twz.utc.year, twz.utc.mon, twz.utc.day, twz.utc.hour]
@@ -166,7 +165,7 @@ class TimeZoneTest < Test::Unit::TestCase
   end
 
   def test_parse
-    zone = TimeZone['Eastern Time (US & Canada)']
+    zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     twz = zone.parse('1999-12-31 19:00:00')
     assert_equal Time.utc(1999,12,31,19), twz.time
     assert_equal Time.utc(2000), twz.utc
@@ -175,7 +174,7 @@ class TimeZoneTest < Test::Unit::TestCase
 
   def test_parse_string_with_timezone
     (-11..13).each do |timezone_offset|
-      zone = TimeZone[timezone_offset]
+      zone = ActiveSupport::TimeZone[timezone_offset]
       twz = zone.parse('1999-12-31 19:00:00')
       assert_equal twz, zone.parse(twz.to_s)
     end
@@ -183,25 +182,25 @@ class TimeZoneTest < Test::Unit::TestCase
 
   def test_parse_with_old_date
     silence_warnings do # silence warnings raised by tzinfo gem
-      zone = TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
       twz = zone.parse('1850-12-31 19:00:00')
       assert_equal [0,0,19,31,12,1850], twz.to_a[0,6]
       assert_equal zone, twz.time_zone
     end
   end
-  
+
   def test_parse_far_future_date_with_time_zone_offset_in_string
     silence_warnings do # silence warnings raised by tzinfo gem
-      zone = TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
       twz = zone.parse('2050-12-31 19:00:00 -10:00') # i.e., 2050-01-01 05:00:00 UTC
       assert_equal [0,0,0,1,1,2051], twz.to_a[0,6]
       assert_equal zone, twz.time_zone
     end
   end
-  
+
   def test_parse_returns_nil_when_string_without_date_information_is_passed_in
     silence_warnings do # silence warnings raised by tzinfo gem
-      zone = TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
       assert_nil zone.parse('foobar')
       assert_nil zone.parse('   ')
     end
@@ -209,80 +208,80 @@ class TimeZoneTest < Test::Unit::TestCase
 
   uses_mocha 'TestParseWithIncompleteDate' do
     def test_parse_with_incomplete_date
-      zone = TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
       zone.stubs(:now).returns zone.local(1999,12,31)
       twz = zone.parse('19:00:00')
       assert_equal Time.utc(1999,12,31,19), twz.time
     end
   end
-  
+
   def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize
     silence_warnings do # silence warnings raised by tzinfo gem
       tzinfo = TZInfo::Timezone.get('America/New_York')
-      zone = TimeZone.create(tzinfo.name, nil, tzinfo)
+      zone = ActiveSupport::TimeZone.create(tzinfo.name, nil, tzinfo)
       assert_equal nil, zone.instance_variable_get('@utc_offset')
       assert_equal(-18_000, zone.utc_offset)
     end
   end
-  
+
   def test_formatted_offset_positive
-    zone = TimeZone['Moscow']
+    zone = ActiveSupport::TimeZone['Moscow']
     assert_equal "+03:00", zone.formatted_offset
     assert_equal "+0300", zone.formatted_offset(false)
   end
-  
+
   def test_formatted_offset_negative
-    zone = TimeZone['Eastern Time (US & Canada)']
+    zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     assert_equal "-05:00", zone.formatted_offset
     assert_equal "-0500", zone.formatted_offset(false)
   end
-  
+
   def test_formatted_offset_zero
-    zone = TimeZone['London']
+    zone = ActiveSupport::TimeZone['London']
     assert_equal "+00:00", zone.formatted_offset
     assert_equal "UTC", zone.formatted_offset(true, 'UTC')
   end
-  
+
   def test_zone_compare
-    zone1 = TimeZone['Central Time (US & Canada)'] # offset -0600
-    zone2 = TimeZone['Eastern Time (US & Canada)'] # offset -0500
+    zone1 = ActiveSupport::TimeZone['Central Time (US & Canada)'] # offset -0600
+    zone2 = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] # offset -0500
     assert zone1 < zone2
     assert zone2 > zone1
     assert zone1 == zone1
   end
-  
+
   def test_to_s
-    assert_equal "(GMT+03:00) Moscow", TimeZone['Moscow'].to_s
+    assert_equal "(GMT+03:00) Moscow", ActiveSupport::TimeZone['Moscow'].to_s
   end
-  
+
   def test_all_sorted
-    all = TimeZone.all
+    all = ActiveSupport::TimeZone.all
     1.upto( all.length-1 ) do |i|
       assert all[i-1] < all[i]
     end
   end
-  
+
   def test_index
-    assert_nil TimeZone["bogus"]
-    assert_instance_of TimeZone, TimeZone["Central Time (US & Canada)"]
-    assert_instance_of TimeZone, TimeZone[8]
-    assert_raises(ArgumentError) { TimeZone[false] }
+    assert_nil ActiveSupport::TimeZone["bogus"]
+    assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone["Central Time (US & Canada)"]
+    assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[8]
+    assert_raises(ArgumentError) { ActiveSupport::TimeZone[false] }
   end
-  
+
   def test_new
-    assert_equal TimeZone["Central Time (US & Canada)"], TimeZone.new("Central Time (US & Canada)")
+    assert_equal ActiveSupport::TimeZone["Central Time (US & Canada)"], ActiveSupport::TimeZone.new("Central Time (US & Canada)")
   end
-  
+
   def test_us_zones
-    assert TimeZone.us_zones.include?(TimeZone["Hawaii"])
-    assert !TimeZone.us_zones.include?(TimeZone["Kuala Lumpur"])
-  end 
-  
+    assert ActiveSupport::TimeZone.us_zones.include?(ActiveSupport::TimeZone["Hawaii"])
+    assert !ActiveSupport::TimeZone.us_zones.include?(ActiveSupport::TimeZone["Kuala Lumpur"])
+  end
+
   protected
     def with_env_tz(new_tz = 'US/Eastern')
       old_tz, ENV['TZ'] = ENV['TZ'], new_tz
       yield
     ensure
       old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
-    end  
+    end
 end
diff --git a/vendor/rails/railties/CHANGELOG b/vendor/rails/railties/CHANGELOG
index fe517755..31f39bad 100644
--- a/vendor/rails/railties/CHANGELOG
+++ b/vendor/rails/railties/CHANGELOG
@@ -1,3 +1,18 @@
+*2.1.1 (September 4th, 2008)*
+
+* Fix script/about in production mode.  #370 [Cheah Chu Yeow, Xavier Noria, David Krmpotic]
+
+* Add the gem load paths before the framework is loaded, so certain gems like RedCloth and BlueCloth can be frozen.
+
+* Fix discrepancies with loading rails/init.rb from gems.
+
+* Plugins check for the gem init path (rails/init.rb) before the standard plugin init path (init.rb)  [Jacek Becela]
+
+* Wrapped Rails.env in StringInquirer so you can do Rails.env.development? [DHH]
+
+* Fixed that RailsInfoController wasn't considering all requests local in development mode (Edgard Castro) [#310 state:resolved]
+
+
 *2.1.0 (May 31st, 2008)*
 
 * script/dbconsole fires up the command-line database client.  #102 [Steve Purcell]
diff --git a/vendor/rails/railties/Rakefile b/vendor/rails/railties/Rakefile
index a1d1095c..8ccd9823 100644
--- a/vendor/rails/railties/Rakefile
+++ b/vendor/rails/railties/Rakefile
@@ -2,6 +2,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rake/contrib/sshpublisher'
 require 'rake/contrib/rubyforgepublisher'
 
 require 'date'
@@ -264,9 +265,10 @@ Rake::RDocTask.new { |rdoc|
   rdoc.title    = "Railties -- Gluing the Engine to the Rails"
   rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object'
   rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/*.rb')
+  rdoc.rdoc_files.include('lib/rails/*.rb')
   rdoc.rdoc_files.include('lib/rails_generator/*.rb')
   rdoc.rdoc_files.include('lib/commands/**/*.rb')
 }
@@ -304,11 +306,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.1')
-  s.add_dependency('activesupport',    '= 2.1.0' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.1.0' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.1.0' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.1.0' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.1.1' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.1.1' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.1.1' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.1.1' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.1.1' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -331,10 +333,10 @@ end
 
 
 # Publishing -------------------------------------------------------
-desc "Publish the API documentation"
+desc "Publish the rails gem"
 task :pgem => [:gem] do 
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
+  Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the release files to RubyForge."
diff --git a/vendor/rails/railties/bin/about b/vendor/rails/railties/bin/about
index cd38a32a..ed8deb0d 100644
--- a/vendor/rails/railties/bin/about
+++ b/vendor/rails/railties/bin/about
@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/about'
+$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
+require 'commands/about'
\ No newline at end of file
diff --git a/vendor/rails/railties/builtin/rails_info/rails/info_controller.rb b/vendor/rails/railties/builtin/rails_info/rails/info_controller.rb
index 39f8b1f1..05745d60 100644
--- a/vendor/rails/railties/builtin/rails_info/rails/info_controller.rb
+++ b/vendor/rails/railties/builtin/rails_info/rails/info_controller.rb
@@ -1,6 +1,6 @@
 class Rails::InfoController < ActionController::Base
   def properties
-    if local_request?
+    if consider_all_requests_local || local_request?
       render :inline => Rails::Info.to_html
     else
       render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => 500
diff --git a/vendor/rails/railties/configs/initializers/inflections.rb b/vendor/rails/railties/configs/initializers/inflections.rb
index 09158b86..d531b8bb 100644
--- a/vendor/rails/railties/configs/initializers/inflections.rb
+++ b/vendor/rails/railties/configs/initializers/inflections.rb
@@ -2,7 +2,7 @@
 
 # Add new inflection rules using the following format 
 # (all these examples are active by default):
-# Inflector.inflections do |inflect|
+# ActiveSupport::Inflector.inflections do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
diff --git a/vendor/rails/railties/configs/initializers/new_rails_defaults.rb b/vendor/rails/railties/configs/initializers/new_rails_defaults.rb
index 5e60c0ad..78e0117c 100644
--- a/vendor/rails/railties/configs/initializers/new_rails_defaults.rb
+++ b/vendor/rails/railties/configs/initializers/new_rails_defaults.rb
@@ -1,11 +1,13 @@
 # These settings change the behavior of Rails 2 apps and will be defaults
 # for Rails 3. You can remove this initializer when Rails 3 is released.
 
-# Include Active Record class name as root for JSON serialized output.
-ActiveRecord::Base.include_root_in_json = true
+if defined?(ActiveRecord)
+  # Include Active Record class name as root for JSON serialized output.
+  ActiveRecord::Base.include_root_in_json = true
 
-# Store the full class name (including module namespace) in STI type column.
-ActiveRecord::Base.store_full_sti_class = true
+  # Store the full class name (including module namespace) in STI type column.
+  ActiveRecord::Base.store_full_sti_class = true
+end
 
 # Use ISO 8601 format for JSON serialized times and dates.
 ActiveSupport.use_standard_json_time_format = true
diff --git a/vendor/rails/railties/configs/routes.rb b/vendor/rails/railties/configs/routes.rb
index b579d6c7..4f3d9d22 100644
--- a/vendor/rails/railties/configs/routes.rb
+++ b/vendor/rails/railties/configs/routes.rb
@@ -36,6 +36,8 @@ ActionController::Routing::Routes.draw do |map|
   # See how all your routes lay out with "rake routes"
 
   # Install the default routes as the lowest priority.
+  # Note: These default routes make all actions in every controller accessible via GET requests. You should
+  # consider removing the them or commenting them out if you're using named routes and resources.
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
 end
diff --git a/vendor/rails/railties/environments/boot.rb b/vendor/rails/railties/environments/boot.rb
index cd21fb9e..6a30b549 100644
--- a/vendor/rails/railties/environments/boot.rb
+++ b/vendor/rails/railties/environments/boot.rb
@@ -82,14 +82,14 @@ module Rails
 
       def load_rubygems
         require 'rubygems'
-
-        unless rubygems_version >= '0.9.4'
-          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+        min_version = '1.1.1'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
         end
 
       rescue LoadError
-        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
 
diff --git a/vendor/rails/railties/environments/environment.rb b/vendor/rails/railties/environments/environment.rb
index a85ade37..2140dfe9 100644
--- a/vendor/rails/railties/environments/environment.rb
+++ b/vendor/rails/railties/environments/environment.rb
@@ -40,7 +40,7 @@ Rails::Initializer.run do |config|
 
   # Make Time.zone default to the specified zone, and make Active Record store time values
   # in the database in UTC, and return them converted to the specified local zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names. Uncomment to use default local time.
+  # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time.
   config.time_zone = 'UTC'
 
   # Your secret key for verifying cookie session data integrity.
diff --git a/vendor/rails/railties/lib/commands/about.rb b/vendor/rails/railties/lib/commands/about.rb
index 313bc18c..7f53ac8a 100644
--- a/vendor/rails/railties/lib/commands/about.rb
+++ b/vendor/rails/railties/lib/commands/about.rb
@@ -1,2 +1,3 @@
 require 'environment'
+require 'rails/info'
 puts Rails::Info
diff --git a/vendor/rails/railties/lib/commands/dbconsole.rb b/vendor/rails/railties/lib/commands/dbconsole.rb
index 17acb7b6..442526ae 100644
--- a/vendor/rails/railties/lib/commands/dbconsole.rb
+++ b/vendor/rails/railties/lib/commands/dbconsole.rb
@@ -41,6 +41,8 @@ when "mysql"
 
   if config['password'] && include_password
     args << "--password=#{config['password']}"
+  elsif config['password'] && !config['password'].empty?
+    args << "-p"
   end
 
   args << config['database']
diff --git a/vendor/rails/railties/lib/commands/plugin.rb b/vendor/rails/railties/lib/commands/plugin.rb
index 105819ce..f52aea40 100644
--- a/vendor/rails/railties/lib/commands/plugin.rb
+++ b/vendor/rails/railties/lib/commands/plugin.rb
@@ -632,7 +632,7 @@ module Commands
     def options
       OptionParser.new do |o|
         o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} source URI [URI [URI]...]"
+        o.banner =    "Usage: #{@base_command.script_name} unsource URI [URI [URI]...]"
         o.define_head "Remove repositories from the default search list."
         o.separator ""
         o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
@@ -890,7 +890,7 @@ class RecursiveHTTPFetcher
 
   def ls
     @urls_to_fetch.collect do |url|
-      if url =~ /^svn:\/\/.*/
+      if url =~ /^svn(\+ssh)?:\/\/.*/
         `svn ls #{url}`.split("\n").map {|entry| "/#{entry}"} rescue nil
       else
         open(url) do |stream|
diff --git a/vendor/rails/railties/lib/console_with_helpers.rb b/vendor/rails/railties/lib/console_with_helpers.rb
index 79018a9f..be453a68 100644
--- a/vendor/rails/railties/lib/console_with_helpers.rb
+++ b/vendor/rails/railties/lib/console_with_helpers.rb
@@ -16,7 +16,7 @@ def helper(*helper_names)
   end
 end
 
-require 'application'
+require_dependency 'application'
 
 class << helper 
   include_all_modules_from ActionView
diff --git a/vendor/rails/railties/lib/initializer.rb b/vendor/rails/railties/lib/initializer.rb
index ca63fa73..b77dc16a 100644
--- a/vendor/rails/railties/lib/initializer.rb
+++ b/vendor/rails/railties/lib/initializer.rb
@@ -36,7 +36,8 @@ module Rails
     end
   
     def env
-      RAILS_ENV
+      require 'active_support/string_inquirer'
+      ActiveSupport::StringInquirer.new(RAILS_ENV)
     end
   
     def cache
@@ -78,7 +79,10 @@ module Rails
 
     # The set of loaded plugins.
     attr_reader :loaded_plugins
-    
+
+    # Whether or not all the gem dependencies have been met
+    attr_reader :gems_dependencies_loaded
+
     # Runs the initializer. By default, this will invoke the #process method,
     # which simply executes all of the initialization routines. Alternately,
     # you can specify explicitly which initialization routine you want:
@@ -109,10 +113,10 @@ module Rails
       check_ruby_version
       install_gem_spec_stubs
       set_load_path
-      
+      add_gem_load_paths
+
       require_frameworks
       set_autoload_paths
-      add_gem_load_paths
       add_plugin_load_paths
       load_environment
 
@@ -200,10 +204,10 @@ module Rails
     # Set the paths from which Rails will automatically load source files, and
     # the load_once paths.
     def set_autoload_paths
-      Dependencies.load_paths = configuration.load_paths.uniq
-      Dependencies.load_once_paths = configuration.load_once_paths.uniq
+      ActiveSupport::Dependencies.load_paths = configuration.load_paths.uniq
+      ActiveSupport::Dependencies.load_once_paths = configuration.load_once_paths.uniq
 
-      extra = Dependencies.load_once_paths - Dependencies.load_paths
+      extra = ActiveSupport::Dependencies.load_once_paths - ActiveSupport::Dependencies.load_paths
       unless extra.empty?
         abort <<-end_error
           load_once_paths must be a subset of the load_paths.
@@ -230,7 +234,7 @@ module Rails
     end
 
     # Adds all load paths from plugins to the global set of load paths, so that
-    # code from plugins can be required (explicitly or automatically via Dependencies).
+    # code from plugins can be required (explicitly or automatically via ActiveSupport::Dependencies).
     def add_plugin_load_paths
       plugin_loader.add_plugin_load_paths
     end
@@ -238,12 +242,12 @@ module Rails
     def add_gem_load_paths
       unless @configuration.gems.empty?
         require "rubygems"
-        @configuration.gems.each &:add_load_paths
+        @configuration.gems.each { |gem| gem.add_load_paths }
       end
     end
 
     def load_gems
-      @configuration.gems.each(&:load)
+      @configuration.gems.each { |gem| gem.load }
     end
 
     def check_gem_dependencies
@@ -252,11 +256,16 @@ module Rails
         @gems_dependencies_loaded = false
         # don't print if the gems rake tasks are being run
         unless $rails_gem_installer
-          puts %{These gems that this application depends on are missing:}
-          unloaded_gems.each do |gem|
-            puts " - #{gem.name}"
-          end
-          puts %{Run "rake gems:install" to install them.}
+          abort <<-end_error
+Missing these required gems:
+  #{unloaded_gems.map { |gem| "#{gem.name}  #{gem.requirement}" } * "\n  "}
+
+You're running:
+  ruby #{Gem.ruby_version} at #{Gem.ruby}
+  rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
+
+Run `rake gems:install` to install the missing gems.
+          end_error
         end
       else
         @gems_dependencies_loaded = true
@@ -306,7 +315,7 @@ module Rails
     end
 
     def load_observers
-      if @gems_dependencies_loaded && configuration.frameworks.include?(:active_record)
+      if gems_dependencies_loaded && configuration.frameworks.include?(:active_record)
         ActiveRecord::Base.instantiate_observers
       end
     end
@@ -412,7 +421,7 @@ module Rails
     # Sets the dependency loading mechanism based on the value of
     # Configuration#cache_classes.
     def initialize_dependency_mechanism
-      Dependencies.mechanism = configuration.cache_classes ? :require : :load
+      ActiveSupport::Dependencies.mechanism = configuration.cache_classes ? :require : :load
     end
 
     # Loads support for "whiny nil" (noisy warnings when methods are invoked
@@ -462,7 +471,7 @@ module Rails
 
     # Fires the user-supplied after_initialize block (Configuration#after_initialize)
     def after_initialize
-      if @gems_dependencies_loaded
+      if gems_dependencies_loaded
         configuration.after_initialize_blocks.each do |block|
           block.call
         end
@@ -470,7 +479,7 @@ module Rails
     end
 
     def load_application_initializers
-      if @gems_dependencies_loaded
+      if gems_dependencies_loaded
         Dir["#{configuration.root_path}/config/initializers/**/*.rb"].sort.each do |initializer|
           load(initializer)
         end
@@ -478,6 +487,7 @@ module Rails
     end
 
     def prepare_dispatcher
+      return unless configuration.frameworks.include?(:action_controller)
       require 'dispatcher' unless defined?(::Dispatcher)
       Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
       Dispatcher.new(RAILS_DEFAULT_LOGGER).send :run_callbacks, :prepare_dispatch
@@ -598,12 +608,12 @@ module Rails
     # If <tt>reload_plugins?</tt> is false, add this to your plugin's <tt>init.rb</tt>
     # to make it reloadable:
     #
-    #   Dependencies.load_once_paths.delete lib_path
+    #   ActiveSupport::Dependencies.load_once_paths.delete lib_path
     #
     # If <tt>reload_plugins?</tt> is true, add this to your plugin's <tt>init.rb</tt>
     # to only load it once:
     #
-    #   Dependencies.load_once_paths << lib_path
+    #   ActiveSupport::Dependencies.load_once_paths << lib_path
     #
     attr_accessor :reload_plugins
 
@@ -620,13 +630,17 @@ module Rails
     # You can add gems with the #gem method.
     attr_accessor :gems
 
-    # Adds a single Gem dependency to the rails application.
+    # Adds a single Gem dependency to the rails application. By default, it will require
+    # the library with the same name as the gem. Use :lib to specify a different name.
     #
     #   # gem 'aws-s3', '>= 0.4.0'
     #   # require 'aws/s3'
     #   config.gem 'aws-s3', :lib => 'aws/s3', :version => '>= 0.4.0', \
     #     :source => "http://code.whytheluckystiff.net"
     #
+    # To require a library be installed, but not attempt to load it, pass :lib => false
+    #
+    #   config.gem 'qrp', :version => '0.4.1', :lib => false
     def gem(name, options = {})
       @gems << Rails::GemDependency.new(name, options)
     end
@@ -698,6 +712,7 @@ module Rails
     # contents of the file are processed via ERB before being sent through
     # YAML::load.
     def database_configuration
+      require 'erb'
       YAML::load(ERB.new(IO.read(database_configuration_file)).result)
     end
 
diff --git a/vendor/rails/railties/lib/rails/gem_dependency.rb b/vendor/rails/railties/lib/rails/gem_dependency.rb
index 9f088a18..471e03fa 100644
--- a/vendor/rails/railties/lib/rails/gem_dependency.rb
+++ b/vendor/rails/railties/lib/rails/gem_dependency.rb
@@ -23,9 +23,13 @@ module Rails
       @unpack_directory = nil
     end
 
+    def unpacked_paths
+      Dir[File.join(self.class.unpacked_path, "#{@name}-#{@version || "*"}")]
+    end
+
     def add_load_paths
       return if @loaded || @load_paths_added
-      unpacked_paths = Dir[File.join(self.class.unpacked_path, "#{@name}-#{@version || "*"}")]
+      unpacked_paths = self.unpacked_paths
       if unpacked_paths.empty?
         args = [@name]
         args << @requirement.to_s if @requirement
@@ -39,7 +43,7 @@ module Rails
       @load_paths_added = true
     rescue Gem::LoadError
     end
-    
+
     def dependencies
       all_dependencies = specification.dependencies.map do |dependency|
         GemDependency.new(dependency.name, :requirement => dependency.version_requirements)
@@ -47,14 +51,14 @@ module Rails
       all_dependencies += all_dependencies.map(&:dependencies).flatten
       all_dependencies.uniq
     end
-    
+
     def gem_dir(base_directory)
       File.join(base_directory, specification.full_name)
     end
 
     def load
       return if @loaded || @load_paths_added == false
-      require(@lib || @name)
+      require(@lib || @name) unless @lib == false
       @loaded = true
     rescue LoadError
       puts $!.to_s
@@ -78,13 +82,13 @@ module Rails
       puts cmd
       puts %x(#{cmd})
     end
-    
+
     def unpack_to(directory)
       FileUtils.mkdir_p directory
       Dir.chdir directory do
         Gem::GemRunner.new.run(unpack_command)
       end
-      
+
       # copy the gem's specification into GEMDIR/.specification so that
       # we can access information about the gem on deployment systems
       # without having the gem installed
@@ -98,27 +102,26 @@ module Rails
       self.name == other.name && self.requirement == other.requirement
     end
 
-private ###################################################################
-
     def specification
       @spec ||= Gem.source_index.search(Gem::Dependency.new(@name, @requirement)).sort_by { |s| s.version }.last
     end
-    
-    def gem_command
-      RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
-    end
 
-    def install_command
-      cmd = %w(install) << @name
-      cmd << "--version" << %("#{@requirement.to_s}") if @requirement
-      cmd << "--source"  << @source  if @source
-      cmd
-    end
-    
-    def unpack_command
-      cmd = %w(unpack) << @name
-      cmd << "--version" << "#{@requirement.to_s}" if @requirement
-      cmd
-    end
+    private
+      def gem_command
+        RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
+      end
+
+      def install_command
+        cmd = %w(install) << @name
+        cmd << "--version" << %("#{@requirement.to_s}") if @requirement
+        cmd << "--source"  << @source  if @source
+        cmd
+      end
+
+      def unpack_command
+        cmd = %w(unpack) << @name
+        cmd << "--version" << %("#{@requirement.to_s}") if @requirement
+        cmd
+      end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/railties/lib/rails/plugin.rb b/vendor/rails/railties/lib/rails/plugin.rb
index 256f4b01..de6a8253 100644
--- a/vendor/rails/railties/lib/rails/plugin.rb
+++ b/vendor/rails/railties/lib/rails/plugin.rb
@@ -87,14 +87,14 @@ module Rails
       end
 
       def evaluate_init_rb(initializer)
-         if has_init_file?
-           silence_warnings do
-             # Allow plugins to reference the current configuration object
-             config = initializer.configuration
-             
-             eval(IO.read(init_path), binding, init_path)
-           end
-         end
+        if has_init_file?
+          silence_warnings do
+            # Allow plugins to reference the current configuration object
+            config = initializer.configuration
+            
+            eval(IO.read(init_path), binding, init_path)
+          end
+        end
       end               
   end
 
@@ -103,8 +103,9 @@ module Rails
   # to Dependencies.load_paths.
   class GemPlugin < Plugin
     # Initialize this plugin from a Gem::Specification.
-    def initialize(spec)
-      super(File.join(spec.full_gem_path))
+    def initialize(spec, gem)
+      directory = (gem.frozen? && gem.unpacked_paths.first) || File.join(spec.full_gem_path)
+      super(directory)
       @name = spec.name
     end
 
diff --git a/vendor/rails/railties/lib/rails/plugin/loader.rb b/vendor/rails/railties/lib/rails/plugin/loader.rb
index 1e542dd0..948d4970 100644
--- a/vendor/rails/railties/lib/rails/plugin/loader.rb
+++ b/vendor/rails/railties/lib/rails/plugin/loader.rb
@@ -45,9 +45,9 @@ module Rails
         plugins.each do |plugin|
           plugin.load_paths.each do |path|
             $LOAD_PATH.insert(application_lib_index + 1, path)
-            Dependencies.load_paths      << path
+            ActiveSupport::Dependencies.load_paths      << path
             unless Rails.configuration.reload_plugins?
-              Dependencies.load_once_paths << path
+              ActiveSupport::Dependencies.load_once_paths << path
             end
           end
         end
diff --git a/vendor/rails/railties/lib/rails/plugin/locator.rb b/vendor/rails/railties/lib/rails/plugin/locator.rb
index f06a51a5..678b295d 100644
--- a/vendor/rails/railties/lib/rails/plugin/locator.rb
+++ b/vendor/rails/railties/lib/rails/plugin/locator.rb
@@ -63,7 +63,7 @@ module Rails
         #     => <Rails::Plugin name: 'acts_as_chunky_bacon' ... >
         #
         def locate_plugins_under(base_path)
-           Dir.glob(File.join(base_path, '*')).inject([]) do |plugins, path|
+           Dir.glob(File.join(base_path, '*')).sort.inject([]) do |plugins, path|
             if plugin = create_plugin(path)
               plugins << plugin
             elsif File.directory?(path)
@@ -78,8 +78,9 @@ module Rails
     # a <tt>rails/init.rb</tt> file.
     class GemLocator < Locator
       def plugins
-        specs  = initializer.configuration.gems.map(&:specification)
-        specs += Gem.loaded_specs.values.select do |spec|
+        gem_index = initializer.configuration.gems.inject({}) { |memo, gem| memo.update gem.specification => gem }
+        specs     = gem_index.keys
+        specs    += Gem.loaded_specs.values.select do |spec|
           spec.loaded_from && # prune stubs
             File.exist?(File.join(spec.full_gem_path, "rails", "init.rb"))
         end
@@ -91,7 +92,7 @@ module Rails
         deps.add(*specs) unless specs.empty?
 
         deps.dependency_order.collect do |spec|
-          Rails::GemPlugin.new(spec)
+          Rails::GemPlugin.new(spec, gem_index[spec])
         end
       end
     end
diff --git a/vendor/rails/railties/lib/rails/version.rb b/vendor/rails/railties/lib/rails/version.rb
index 48d24da5..68cbb79e 100644
--- a/vendor/rails/railties/lib/rails/version.rb
+++ b/vendor/rails/railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/railties/lib/rails_generator/commands.rb b/vendor/rails/railties/lib/rails_generator/commands.rb
index 08ecbfb5..17ba03f5 100644
--- a/vendor/rails/railties/lib/rails_generator/commands.rb
+++ b/vendor/rails/railties/lib/rails_generator/commands.rb
@@ -57,6 +57,17 @@ module Rails
         end
 
         protected
+          def current_migration_number
+            Dir.glob("#{RAILS_ROOT}/#{@migration_directory}/[0-9]*_*.rb").inject(0) do |max, file_path|
+              n = File.basename(file_path).split('_', 2).first.to_i
+              if n > max then n else max end
+            end
+          end
+             
+          def next_migration_number
+            current_migration_number + 1
+          end
+               
           def migration_directory(relative_path)
             directory(@migration_directory = relative_path)
           end
@@ -70,7 +81,11 @@ module Rails
           end
 
           def next_migration_string(padding = 3)
-            Time.now.utc.strftime("%Y%m%d%H%M%S")
+            if ActiveRecord::Base.timestamped_migrations
+              Time.now.utc.strftime("%Y%m%d%H%M%S")
+            else
+              "%.#{padding}d" % next_migration_number
+            end
           end
 
           def gsub_file(relative_destination, regexp, *args, &block)
@@ -88,7 +103,7 @@ module Rails
                 Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp|
                   temp.write render_file(src, file_options, &block)
                   temp.rewind
-                  $stdout.puts `#{diff_cmd} #{dst} #{temp.path}`
+                  $stdout.puts `#{diff_cmd} "#{dst}" "#{temp.path}"`
                 end
                 puts "retrying"
                 raise 'retry diff'
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb b/vendor/rails/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
index 1faf8ed9..3429d587 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class <%= class_name %>ObserverTest < Test::Unit::TestCase
+class <%= class_name %>ObserverTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/rails/railties/lib/rails_generator/lookup.rb b/vendor/rails/railties/lib/rails_generator/lookup.rb
index 1f28c39d..0526d526 100644
--- a/vendor/rails/railties/lib/rails_generator/lookup.rb
+++ b/vendor/rails/railties/lib/rails_generator/lookup.rb
@@ -108,7 +108,7 @@ module Rails
             sources << PathSource.new(:vendor, "#{::RAILS_ROOT}/vendor/generators")
             Rails.configuration.plugin_paths.each do |path|
               relative_path = Pathname.new(File.expand_path(path)).relative_path_from(Pathname.new(::RAILS_ROOT))
-              sources << PathSource.new(:"plugins (#{relative_path})", "#{path}/**/{,rails_}generators")
+              sources << PathSource.new(:"plugins (#{relative_path})", "#{path}/*/**/{,rails_}generators")
             end
           end
           sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
diff --git a/vendor/rails/railties/lib/tasks/databases.rake b/vendor/rails/railties/lib/tasks/databases.rake
index 8077d0a4..22b8459c 100644
--- a/vendor/rails/railties/lib/tasks/databases.rake
+++ b/vendor/rails/railties/lib/tasks/databases.rake
@@ -215,14 +215,14 @@ namespace :db do
     desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
     task :dump => :environment do
       require 'active_record/schema_dumper'
-      File.open(ENV['SCHEMA'] || "db/schema.rb", "w") do |file|
+      File.open(ENV['SCHEMA'] || "#{RAILS_ROOT}/db/schema.rb", "w") do |file|
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
       end
     end
 
     desc "Load a schema.rb file into the database"
     task :load => :environment do
-      file = ENV['SCHEMA'] || "db/schema.rb"
+      file = ENV['SCHEMA'] || "#{RAILS_ROOT}/db/schema.rb"
       load(file)
     end
   end
@@ -234,7 +234,7 @@ namespace :db do
       case abcs[RAILS_ENV]["adapter"]
       when "mysql", "oci", "oracle"
         ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
-        File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
+        File.open("#{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
       when "postgresql"
         ENV['PGHOST']     = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["host"]
         ENV['PGPORT']     = abcs[RAILS_ENV]["port"].to_s if abcs[RAILS_ENV]["port"]
@@ -252,25 +252,27 @@ namespace :db do
       when "firebird"
         set_firebird_env(abcs[RAILS_ENV])
         db_string = firebird_db_string(abcs[RAILS_ENV])
-        sh "isql -a #{db_string} > db/#{RAILS_ENV}_structure.sql"
+        sh "isql -a #{db_string} > #{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql"
       else
         raise "Task not supported by '#{abcs["test"]["adapter"]}'"
       end
 
       if ActiveRecord::Base.connection.supports_migrations?
-        File.open("db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+        File.open("#{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
       end
     end
   end
 
   namespace :test do
-    desc "Recreate the test database from the current environment's database schema"
-    task :clone => %w(db:schema:dump db:test:purge) do
+    desc "Recreate the test database from the current schema.rb"
+    task :load => 'db:test:purge' do
       ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
       ActiveRecord::Schema.verbose = false
       Rake::Task["db:schema:load"].invoke
     end
 
+    desc "Recreate the test database from the current environment's database schema"
+    task :clone => %w(db:schema:dump db:test:load)
 
     desc "Recreate the test databases from the development structure"
     task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
@@ -279,28 +281,28 @@ namespace :db do
       when "mysql"
         ActiveRecord::Base.establish_connection(:test)
         ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
-        IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
+        IO.readlines("#{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
           ActiveRecord::Base.connection.execute(table)
         end
       when "postgresql"
         ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
         ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
         ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
-        `psql -U "#{abcs["test"]["username"]}" -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}`
+        `psql -U "#{abcs["test"]["username"]}" -f #{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}`
       when "sqlite", "sqlite3"
         dbfile = abcs["test"]["database"] || abcs["test"]["dbfile"]
-        `#{abcs["test"]["adapter"]} #{dbfile} < db/#{RAILS_ENV}_structure.sql`
+        `#{abcs["test"]["adapter"]} #{dbfile} < #{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql`
       when "sqlserver"
         `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
       when "oci", "oracle"
         ActiveRecord::Base.establish_connection(:test)
-        IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
+        IO.readlines("#{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
           ActiveRecord::Base.connection.execute(ddl)
         end
       when "firebird"
         set_firebird_env(abcs["test"])
         db_string = firebird_db_string(abcs["test"])
-        sh "isql -i db/#{RAILS_ENV}_structure.sql #{db_string}"
+        sh "isql -i #{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql #{db_string}"
       else
         raise "Task not supported by '#{abcs["test"]["adapter"]}'"
       end
@@ -337,10 +339,10 @@ namespace :db do
       end
     end
 
-    desc 'Prepare the test database and load the schema'
-    task :prepare => %w(environment db:abort_if_pending_migrations) do
+    desc 'Check for pending migrations and load the test schema'
+    task :prepare => 'db:abort_if_pending_migrations' do
       if defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
-        Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke
+        Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:load" }[ActiveRecord::Base.schema_format]].invoke
       end
     end
   end
diff --git a/vendor/rails/railties/lib/tasks/documentation.rake b/vendor/rails/railties/lib/tasks/documentation.rake
index 331b2450..c5044aa4 100644
--- a/vendor/rails/railties/lib/tasks/documentation.rake
+++ b/vendor/rails/railties/lib/tasks/documentation.rake
@@ -1,9 +1,9 @@
 namespace :doc do
-  desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb"
+  desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\""
   Rake::RDocTask.new("app") { |rdoc|
     rdoc.rdoc_dir = 'doc/app'
     rdoc.template = ENV['template'] if ENV['template']
-    rdoc.title    = "Rails Application Documentation"
+    rdoc.title    = ENV['title'] || "Rails Application Documentation"
     rdoc.options << '--line-numbers' << '--inline-source'
     rdoc.options << '--charset' << 'utf-8'
     rdoc.rdoc_files.include('doc/README_FOR_APP')
diff --git a/vendor/rails/railties/lib/tasks/misc.rake b/vendor/rails/railties/lib/tasks/misc.rake
index 61042595..33bbba11 100644
--- a/vendor/rails/railties/lib/tasks/misc.rake
+++ b/vendor/rails/railties/lib/tasks/misc.rake
@@ -44,7 +44,7 @@ namespace :time do
         end
       end
       previous_offset = nil
-      TimeZone.__send__(method).each do |zone|
+      ActiveSupport::TimeZone.__send__(method).each do |zone|
         if offset.nil? || offset == zone.utc_offset
           puts "\n* UTC #{zone.formatted_offset} *" unless zone.utc_offset == previous_offset
           puts zone.name
diff --git a/vendor/rails/railties/lib/tasks/rails.rb b/vendor/rails/railties/lib/tasks/rails.rb
index bfcf5bc4..8c2b7f9b 100644
--- a/vendor/rails/railties/lib/tasks/rails.rb
+++ b/vendor/rails/railties/lib/tasks/rails.rb
@@ -4,5 +4,5 @@ $VERBOSE = nil
 Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
-Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
 Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
diff --git a/vendor/rails/railties/test/gem_dependency_test.rb b/vendor/rails/railties/test/gem_dependency_test.rb
index 3ae01893..964ca509 100644
--- a/vendor/rails/railties/test/gem_dependency_test.rb
+++ b/vendor/rails/railties/test/gem_dependency_test.rb
@@ -10,13 +10,14 @@ uses_mocha "Plugin Tests" do
       @gem              = Rails::GemDependency.new "hpricot"
       @gem_with_source  = Rails::GemDependency.new "hpricot", :source => "http://code.whytheluckystiff.net"
       @gem_with_version = Rails::GemDependency.new "hpricot", :version => "= 0.6"
-      @gem_with_lib     = Rails::GemDependency.new "aws-s3", :lib => "aws/s3" 
+      @gem_with_lib     = Rails::GemDependency.new "aws-s3", :lib => "aws/s3"
+      @gem_without_load  = Rails::GemDependency.new "hpricot", :lib => false
     end
 
     def test_configuration_adds_gem_dependency
       config = Rails::Configuration.new
       config.gem "aws-s3", :lib => "aws/s3", :version => "0.4.0"
-      assert_equal [["install", "aws-s3", "--version", "= 0.4.0"]], config.gems.collect(&:install_command)
+      assert_equal [["install", "aws-s3", "--version", '"= 0.4.0"']], config.gems.collect(&:install_command)
     end
 
     def test_gem_creates_install_command
@@ -28,7 +29,7 @@ uses_mocha "Plugin Tests" do
     end
 
     def test_gem_with_version_creates_install_command
-      assert_equal ["install", "hpricot", "--version", "= 0.6"], @gem_with_version.install_command
+      assert_equal ["install", "hpricot", "--version", '"= 0.6"'], @gem_with_version.install_command
     end
 
     def test_gem_creates_unpack_command
@@ -36,31 +37,39 @@ uses_mocha "Plugin Tests" do
     end
 
     def test_gem_with_version_unpack_install_command
-      assert_equal ["unpack", "hpricot", "--version", "= 0.6"], @gem_with_version.unpack_command
+      assert_equal ["unpack", "hpricot", "--version", '"= 0.6"'], @gem_with_version.unpack_command
     end
 
     def test_gem_adds_load_paths
       @gem.expects(:gem).with(@gem.name)
       @gem.add_load_paths
     end
-  
+
     def test_gem_with_version_adds_load_paths
       @gem_with_version.expects(:gem).with(@gem_with_version.name, @gem_with_version.requirement.to_s)
       @gem_with_version.add_load_paths
     end
-  
+
     def test_gem_loading
       @gem.expects(:gem).with(@gem.name)
       @gem.expects(:require).with(@gem.name)
       @gem.add_load_paths
       @gem.load
     end
-  
+
     def test_gem_with_lib_loading
       @gem_with_lib.expects(:gem).with(@gem_with_lib.name)
       @gem_with_lib.expects(:require).with(@gem_with_lib.lib)
       @gem_with_lib.add_load_paths
       @gem_with_lib.load
     end
+
+    def test_gem_without_lib_loading
+      @gem_without_load.expects(:gem).with(@gem_without_load.name)
+      @gem_without_load.expects(:require).with(@gem_without_load.lib).never
+      @gem_without_load.add_load_paths
+      @gem_without_load.load
+    end
+
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/railties/test/generators/generator_test_helper.rb b/vendor/rails/railties/test/generators/generator_test_helper.rb
index 05dca340..7fa05a01 100644
--- a/vendor/rails/railties/test/generators/generator_test_helper.rb
+++ b/vendor/rails/railties/test/generators/generator_test_helper.rb
@@ -5,9 +5,10 @@ require 'fileutils'
 module ActiveRecord
   class Base
     class << self
-      attr_accessor :pluralize_table_names
+      attr_accessor :pluralize_table_names, :timestamped_migrations
     end
     self.pluralize_table_names = true
+    self.timestamped_migrations = true
   end
 
   module ConnectionAdapters
diff --git a/vendor/rails/railties/test/initializer_test.rb b/vendor/rails/railties/test/initializer_test.rb
index 0df0164c..efce4f29 100644
--- a/vendor/rails/railties/test/initializer_test.rb
+++ b/vendor/rails/railties/test/initializer_test.rb
@@ -38,27 +38,28 @@ class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::Te
     end
     config.after_initialize do
       $test_after_initialize_block2 = "congratulations"
-    end    
+    end
     assert_nil $test_after_initialize_block1
-    assert_nil $test_after_initialize_block2    
+    assert_nil $test_after_initialize_block2
 
+    Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
     Rails::Initializer.run(:after_initialize, config)
   end
-  
+
   def teardown
     $test_after_initialize_block1 = nil
-    $test_after_initialize_block2 = nil    
+    $test_after_initialize_block2 = nil
   end
 
   def test_should_have_called_the_first_after_initialize_block
     assert_equal "success", $test_after_initialize_block1
   end
-  
+
   def test_should_have_called_the_second_after_initialize_block
     assert_equal "congratulations", $test_after_initialize_block2
   end
 end
-  
+
 class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::TestCase
 
   def setup
@@ -69,15 +70,16 @@ class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::
     config.after_initialize # don't pass a block, this is what we're testing!
     config.after_initialize do
       $test_after_initialize_block2 = "congratulations"
-    end    
+    end
     assert_nil $test_after_initialize_block1
 
+    Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
     Rails::Initializer.run(:after_initialize, config)
   end
 
   def teardown
     $test_after_initialize_block1 = nil
-    $test_after_initialize_block2 = nil    
+    $test_after_initialize_block2 = nil
   end
 
   def test_should_have_called_the_first_after_initialize_block
@@ -95,7 +97,7 @@ uses_mocha 'framework paths' do
     def setup
       @config = Rails::Configuration.new
       @config.frameworks.clear
-      
+
       File.stubs(:directory?).returns(true)
       @config.stubs(:framework_root_path).returns('')
     end
@@ -112,7 +114,7 @@ uses_mocha 'framework paths' do
     def test_actioncontroller_or_actionview_add_actionpack
       @config.frameworks << :action_controller
       assert_framework_path '/actionpack/lib'
-      
+
       @config.frameworks = [:action_view]
       assert_framework_path '/actionpack/lib'
     end
@@ -204,22 +206,22 @@ uses_mocha "Initializer plugin loading tests" do
         load_plugins!
       end
     end
-    
+
     def test_should_ensure_all_loaded_plugins_load_paths_are_added_to_the_load_path
       only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
 
       @initializer.add_plugin_load_paths
-      
+
       assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
       assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
     end
-    
+
     private
-    
+
       def load_plugins!
         @initializer.add_plugin_load_paths
         @initializer.load_plugins
       end
   end
-  
-end  
+
+end
diff --git a/vendor/rails/railties/test/plugin_loader_test.rb b/vendor/rails/railties/test/plugin_loader_test.rb
index 41bd6ec7..4283cb6a 100644
--- a/vendor/rails/railties/test/plugin_loader_test.rb
+++ b/vendor/rails/railties/test/plugin_loader_test.rb
@@ -94,7 +94,7 @@ uses_mocha "Plugin Loader Tests" do
 
     def test_should_add_plugin_load_paths_to_global_LOAD_PATH_array
       only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
-      stubbed_application_lib_index_in_LOAD_PATHS = 5
+      stubbed_application_lib_index_in_LOAD_PATHS = 4
       @loader.stubs(:application_lib_index).returns(stubbed_application_lib_index_in_LOAD_PATHS)
 
       @loader.add_plugin_load_paths
@@ -108,8 +108,8 @@ uses_mocha "Plugin Loader Tests" do
 
       @loader.add_plugin_load_paths
 
-      assert Dependencies.load_paths.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
-      assert Dependencies.load_paths.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
+      assert ActiveSupport::Dependencies.load_paths.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
+      assert ActiveSupport::Dependencies.load_paths.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
     end
 
     def test_should_add_plugin_load_paths_to_Dependencies_load_once_paths
@@ -117,8 +117,8 @@ uses_mocha "Plugin Loader Tests" do
 
       @loader.add_plugin_load_paths
 
-      assert Dependencies.load_once_paths.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
-      assert Dependencies.load_once_paths.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
+      assert ActiveSupport::Dependencies.load_once_paths.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
+      assert ActiveSupport::Dependencies.load_once_paths.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
     end
 
     def test_should_add_all_load_paths_from_a_plugin_to_LOAD_PATH_array
diff --git a/vendor/rails/railties/test/rails_info_controller_test.rb b/vendor/rails/railties/test/rails_info_controller_test.rb
index 17c7d9de..e1872ebf 100644
--- a/vendor/rails/railties/test/rails_info_controller_test.rb
+++ b/vendor/rails/railties/test/rails_info_controller_test.rb
@@ -30,6 +30,8 @@ class Rails::InfoControllerTest < Test::Unit::TestCase
     @controller = Rails::InfoController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+
+    ActionController::Base.consider_all_requests_local = true
   end
 
   def test_rails_info_properties_table_rendered_for_local_request
@@ -41,6 +43,8 @@ class Rails::InfoControllerTest < Test::Unit::TestCase
   
   def test_rails_info_properties_error_rendered_for_non_local_request
     Rails::InfoController.local_request = false
+    ActionController::Base.consider_all_requests_local = false
+
     get :properties
     assert_tag :tag => 'p'
     assert_response 500