Merge commit 'mainstream/master'

146 files changed, 463 insertions, 206 deletions

diff --git a/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb b/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
index 0bff6cf9ad..d87eb17337 100644
--- a/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
@@ -3,12 +3,17 @@ module ActiveSupport
     class CompressedMemCacheStore < MemCacheStore
       def read(name, options = nil)
         if value = super(name, (options || {}).merge(:raw => true))
-          Marshal.load(ActiveSupport::Gzip.decompress(value))
+          if raw?(options)
+            value
+          else
+            Marshal.load(ActiveSupport::Gzip.decompress(value))
+          end
         end
       end
 
       def write(name, value, options = nil)
-        super(name, ActiveSupport::Gzip.compress(Marshal.dump(value)), (options || {}).merge(:raw => true))
+        value = ActiveSupport::Gzip.compress(Marshal.dump(value)) unless raw?(options)
+        super(name, value, (options || {}).merge(:raw => true))
       end
     end
   end
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index ef533633b2..ffe0baba99 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -16,6 +16,7 @@ module ActiveSupport
         super
         ensure_cache_path(File.dirname(real_file_path(name)))
         File.atomic_write(real_file_path(name), cache_path) { |f| Marshal.dump(value, f) }
+        value
       rescue => e
         logger.error "Couldn't create cache directory: #{name} (#{e.message})" if logger
       end
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 58958dccef..5531c30b7f 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -34,6 +34,9 @@ module ActiveSupport
       def write(key, value, options = nil)
         super
         method = options && options[:unless_exist] ? :add : :set
+        # memcache-client will break the connection if you send it an integer
+        # in raw mode, so we convert it to a string to be sure it continues working.
+        value = value.to_s if raw?(options)
         response = @data.send(method, key, value, expires_in(options), raw?(options))
         response == Response::STORED
       rescue MemCache::MemCacheError => e
diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb
index e0b5f3e379..1ad18402e5 100644
--- a/activesupport/lib/active_support/core_ext/module/delegation.rb
+++ b/activesupport/lib/active_support/core_ext/module/delegation.rb
@@ -47,15 +47,42 @@ class Module
   #   Foo.new.min # => 4
   #   Foo.new.max # => 11
   #
+  # Delegates can optionally be prefixed using the <tt>:prefix</tt> option. If the value
+  # is <tt>true</tt>, the delegate methods are prefixed with the name of the object being
+  # delegated to.
+  #
+  #   Person = Struct.new(:name, :address)
+  #
+  #   class Invoice < Struct.new(:client)
+  #     delegate :name, :address, :to => :client, :prefix => true
+  #   end
+  #
+  #   john_doe = Person.new("John Doe", "Vimmersvej 13")
+  #   invoice = Invoice.new(john_doe)
+  #   invoice.client_name    # => "John Doe"
+  #   invoice.client_address # => "Vimmersvej 13"
+  #
+  # It is also possible to supply a custom prefix.
+  #
+  #   class Invoice < Struct.new(:client)
+  #     delegate :name, :address, :to => :client, :prefix => :customer
+  #   end
+  #
+  #   invoice = Invoice.new(john_doe)
+  #   invoice.customer_name    # => "John Doe"
+  #   invoice.customer_address # => "Vimmersvej 13"
+  #
   def delegate(*methods)
     options = methods.pop
     unless options.is_a?(Hash) && to = options[:to]
       raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter)."
     end
 
+    prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_"
+
     methods.each do |method|
       module_eval(<<-EOS, "(__DELEGATION__)", 1)
-        def #{method}(*args, &block)
+        def #{prefix}#{method}(*args, &block)
           #{to}.__send__(#{method.inspect}, *args, &block)
         end
       EOS
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index b7b8807c6d..a02cd81f72 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -277,9 +277,9 @@ module ActiveSupport
     end
     alias_method :kind_of?, :is_a?
 
-    # Neuter freeze because freezing can cause problems with lazy loading of attributes.
     def freeze
-      self
+      period; utc; time # preload instance variables before freezing
+      super
     end
 
     def marshal_dump
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index a294dd0ba3..4991f71683 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -51,7 +51,7 @@ module ActiveSupport
         "La Paz"                       => "America/La_Paz",
         "Santiago"                     => "America/Santiago",
         "Newfoundland"                 => "America/St_Johns",
-        "Brasilia"                     => "America/Argentina/Buenos_Aires",
+        "Brasilia"                     => "America/Sao_Paulo",
         "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
         "Georgetown"                   => "America/Argentina/San_Juan",
         "Greenland"                    => "America/Godthab",
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index acd94af783..633eb2ef08 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -20,9 +20,9 @@ rescue Gem::LoadError
 end
 
 begin
-  gem 'tzinfo', '~> 0.3.9'
+  gem 'tzinfo', '~> 0.3.11'
 rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.9"
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.11"
 end
 
 # TODO I18n gem has not been released yet
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo.rb
index c8bdbeec5d..c8bdbeec5d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/data_timezone.rb
index 2510e90b5b..5eccbdf0db 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/data_timezone.rb
@@ -38,7 +38,7 @@ module TZInfo
     
     # 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.
+    # 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)
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/data_timezone_info.rb
index 8829ba9cc8..a45d94554b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/data_timezone_info.rb
@@ -66,7 +66,7 @@ module TZInfo
     # 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
-    # denominator specify the time the transition occurs as. See
+    # 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]      
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Algiers.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Algiers.rb
index 8c5f25577f..8c5f25577f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Algiers.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Algiers.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Cairo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Cairo.rb
index 6e6daf3522..6e6daf3522 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Cairo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Cairo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Casablanca.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Casablanca.rb
index dddf533f61..d1eb5c5724 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Casablanca.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Casablanca.rb
@@ -32,7 +32,7 @@ module TZInfo
           tz.transition 1984, 3, :o3, 448243200
           tz.transition 1985, 12, :o1, 504918000
           tz.transition 2008, 6, :o2, 1212278400
-          tz.transition 2008, 9, :o1, 1222556400
+          tz.transition 2008, 8, :o1, 1220223600
         end
       end
     end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Harare.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Harare.rb
index 070c95ae0f..070c95ae0f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Harare.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Harare.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Johannesburg.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Johannesburg.rb
index f0af0d8e33..f0af0d8e33 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Johannesburg.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Johannesburg.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Monrovia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Monrovia.rb
index 40e711fa44..40e711fa44 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Monrovia.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Monrovia.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Nairobi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Nairobi.rb
index 7b0a2f43be..7b0a2f43be 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Africa/Nairobi.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Africa/Nairobi.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/Buenos_Aires.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
index 7536f7553c..8f4dd31dbb 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
@@ -74,89 +74,89 @@ module TZInfo
             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 2008, 10, :o5, 1224385200
             tz.transition 2009, 3, :o4, 1237082400
-            tz.transition 2009, 10, :o5, 1254625200
+            tz.transition 2009, 10, :o5, 1255834800
             tz.transition 2010, 3, :o4, 1269136800
-            tz.transition 2010, 10, :o5, 1286074800
+            tz.transition 2010, 10, :o5, 1287284400
             tz.transition 2011, 3, :o4, 1300586400
-            tz.transition 2011, 10, :o5, 1317524400
+            tz.transition 2011, 10, :o5, 1318734000
             tz.transition 2012, 3, :o4, 1332036000
-            tz.transition 2012, 10, :o5, 1349578800
+            tz.transition 2012, 10, :o5, 1350788400
             tz.transition 2013, 3, :o4, 1363485600
-            tz.transition 2013, 10, :o5, 1381028400
+            tz.transition 2013, 10, :o5, 1382238000
             tz.transition 2014, 3, :o4, 1394935200
-            tz.transition 2014, 10, :o5, 1412478000
+            tz.transition 2014, 10, :o5, 1413687600
             tz.transition 2015, 3, :o4, 1426384800
-            tz.transition 2015, 10, :o5, 1443927600
+            tz.transition 2015, 10, :o5, 1445137200
             tz.transition 2016, 3, :o4, 1458439200
-            tz.transition 2016, 10, :o5, 1475377200
+            tz.transition 2016, 10, :o5, 1476586800
             tz.transition 2017, 3, :o4, 1489888800
-            tz.transition 2017, 10, :o5, 1506826800
+            tz.transition 2017, 10, :o5, 1508036400
             tz.transition 2018, 3, :o4, 1521338400
-            tz.transition 2018, 10, :o5, 1538881200
+            tz.transition 2018, 10, :o5, 1540090800
             tz.transition 2019, 3, :o4, 1552788000
-            tz.transition 2019, 10, :o5, 1570330800
+            tz.transition 2019, 10, :o5, 1571540400
             tz.transition 2020, 3, :o4, 1584237600
-            tz.transition 2020, 10, :o5, 1601780400
+            tz.transition 2020, 10, :o5, 1602990000
             tz.transition 2021, 3, :o4, 1616292000
-            tz.transition 2021, 10, :o5, 1633230000
+            tz.transition 2021, 10, :o5, 1634439600
             tz.transition 2022, 3, :o4, 1647741600
-            tz.transition 2022, 10, :o5, 1664679600
+            tz.transition 2022, 10, :o5, 1665889200
             tz.transition 2023, 3, :o4, 1679191200
-            tz.transition 2023, 10, :o5, 1696129200
+            tz.transition 2023, 10, :o5, 1697338800
             tz.transition 2024, 3, :o4, 1710640800
-            tz.transition 2024, 10, :o5, 1728183600
+            tz.transition 2024, 10, :o5, 1729393200
             tz.transition 2025, 3, :o4, 1742090400
-            tz.transition 2025, 10, :o5, 1759633200
+            tz.transition 2025, 10, :o5, 1760842800
             tz.transition 2026, 3, :o4, 1773540000
-            tz.transition 2026, 10, :o5, 1791082800
+            tz.transition 2026, 10, :o5, 1792292400
             tz.transition 2027, 3, :o4, 1805594400
-            tz.transition 2027, 10, :o5, 1822532400
+            tz.transition 2027, 10, :o5, 1823742000
             tz.transition 2028, 3, :o4, 1837044000
-            tz.transition 2028, 10, :o5, 1853982000
+            tz.transition 2028, 10, :o5, 1855191600
             tz.transition 2029, 3, :o4, 1868493600
-            tz.transition 2029, 10, :o5, 1886036400
+            tz.transition 2029, 10, :o5, 1887246000
             tz.transition 2030, 3, :o4, 1899943200
-            tz.transition 2030, 10, :o5, 1917486000
+            tz.transition 2030, 10, :o5, 1918695600
             tz.transition 2031, 3, :o4, 1931392800
-            tz.transition 2031, 10, :o5, 1948935600
+            tz.transition 2031, 10, :o5, 1950145200
             tz.transition 2032, 3, :o4, 1963447200
-            tz.transition 2032, 10, :o5, 1980385200
+            tz.transition 2032, 10, :o5, 1981594800
             tz.transition 2033, 3, :o4, 1994896800
-            tz.transition 2033, 10, :o5, 2011834800
+            tz.transition 2033, 10, :o5, 2013044400
             tz.transition 2034, 3, :o4, 2026346400
-            tz.transition 2034, 10, :o5, 2043284400
+            tz.transition 2034, 10, :o5, 2044494000
             tz.transition 2035, 3, :o4, 2057796000
-            tz.transition 2035, 10, :o5, 2075338800
+            tz.transition 2035, 10, :o5, 2076548400
             tz.transition 2036, 3, :o4, 2089245600
-            tz.transition 2036, 10, :o5, 2106788400
+            tz.transition 2036, 10, :o5, 2107998000
             tz.transition 2037, 3, :o4, 2120695200
-            tz.transition 2037, 10, :o5, 2138238000
+            tz.transition 2037, 10, :o5, 2139447600
             tz.transition 2038, 3, :o4, 29586043, 12
-            tz.transition 2038, 10, :o5, 19725597, 8
+            tz.transition 2038, 10, :o5, 19725709, 8
             tz.transition 2039, 3, :o4, 29590411, 12
-            tz.transition 2039, 10, :o5, 19728509, 8
+            tz.transition 2039, 10, :o5, 19728621, 8
             tz.transition 2040, 3, :o4, 29594779, 12
-            tz.transition 2040, 10, :o5, 19731477, 8
+            tz.transition 2040, 10, :o5, 19731589, 8
             tz.transition 2041, 3, :o4, 29599147, 12
-            tz.transition 2041, 10, :o5, 19734389, 8
+            tz.transition 2041, 10, :o5, 19734501, 8
             tz.transition 2042, 3, :o4, 29603515, 12
-            tz.transition 2042, 10, :o5, 19737301, 8
+            tz.transition 2042, 10, :o5, 19737413, 8
             tz.transition 2043, 3, :o4, 29607883, 12
-            tz.transition 2043, 10, :o5, 19740213, 8
+            tz.transition 2043, 10, :o5, 19740325, 8
             tz.transition 2044, 3, :o4, 29612335, 12
-            tz.transition 2044, 10, :o5, 19743125, 8
+            tz.transition 2044, 10, :o5, 19743237, 8
             tz.transition 2045, 3, :o4, 29616703, 12
-            tz.transition 2045, 10, :o5, 19746037, 8
+            tz.transition 2045, 10, :o5, 19746149, 8
             tz.transition 2046, 3, :o4, 29621071, 12
-            tz.transition 2046, 10, :o5, 19749005, 8
+            tz.transition 2046, 10, :o5, 19749117, 8
             tz.transition 2047, 3, :o4, 29625439, 12
-            tz.transition 2047, 10, :o5, 19751917, 8
+            tz.transition 2047, 10, :o5, 19752029, 8
             tz.transition 2048, 3, :o4, 29629807, 12
-            tz.transition 2048, 10, :o5, 19754829, 8
+            tz.transition 2048, 10, :o5, 19754941, 8
             tz.transition 2049, 3, :o4, 29634259, 12
-            tz.transition 2049, 10, :o5, 19757741, 8
+            tz.transition 2049, 10, :o5, 19757853, 8
             tz.transition 2050, 3, :o4, 29638627, 12
           end
         end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/San_Juan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Argentina/San_Juan.rb
index a5413612ee..4a9663684d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Argentina/San_Juan.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Argentina/San_Juan.rb
@@ -78,89 +78,89 @@ module TZInfo
             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 2008, 10, :o5, 1224385200
             tz.transition 2009, 3, :o4, 1237082400
-            tz.transition 2009, 10, :o5, 1254625200
+            tz.transition 2009, 10, :o5, 1255834800
             tz.transition 2010, 3, :o4, 1269136800
-            tz.transition 2010, 10, :o5, 1286074800
+            tz.transition 2010, 10, :o5, 1287284400
             tz.transition 2011, 3, :o4, 1300586400
-            tz.transition 2011, 10, :o5, 1317524400
+            tz.transition 2011, 10, :o5, 1318734000
             tz.transition 2012, 3, :o4, 1332036000
-            tz.transition 2012, 10, :o5, 1349578800
+            tz.transition 2012, 10, :o5, 1350788400
             tz.transition 2013, 3, :o4, 1363485600
-            tz.transition 2013, 10, :o5, 1381028400
+            tz.transition 2013, 10, :o5, 1382238000
             tz.transition 2014, 3, :o4, 1394935200
-            tz.transition 2014, 10, :o5, 1412478000
+            tz.transition 2014, 10, :o5, 1413687600
             tz.transition 2015, 3, :o4, 1426384800
-            tz.transition 2015, 10, :o5, 1443927600
+            tz.transition 2015, 10, :o5, 1445137200
             tz.transition 2016, 3, :o4, 1458439200
-            tz.transition 2016, 10, :o5, 1475377200
+            tz.transition 2016, 10, :o5, 1476586800
             tz.transition 2017, 3, :o4, 1489888800
-            tz.transition 2017, 10, :o5, 1506826800
+            tz.transition 2017, 10, :o5, 1508036400
             tz.transition 2018, 3, :o4, 1521338400
-            tz.transition 2018, 10, :o5, 1538881200
+            tz.transition 2018, 10, :o5, 1540090800
             tz.transition 2019, 3, :o4, 1552788000
-            tz.transition 2019, 10, :o5, 1570330800
+            tz.transition 2019, 10, :o5, 1571540400
             tz.transition 2020, 3, :o4, 1584237600
-            tz.transition 2020, 10, :o5, 1601780400
+            tz.transition 2020, 10, :o5, 1602990000
             tz.transition 2021, 3, :o4, 1616292000
-            tz.transition 2021, 10, :o5, 1633230000
+            tz.transition 2021, 10, :o5, 1634439600
             tz.transition 2022, 3, :o4, 1647741600
-            tz.transition 2022, 10, :o5, 1664679600
+            tz.transition 2022, 10, :o5, 1665889200
             tz.transition 2023, 3, :o4, 1679191200
-            tz.transition 2023, 10, :o5, 1696129200
+            tz.transition 2023, 10, :o5, 1697338800
             tz.transition 2024, 3, :o4, 1710640800
-            tz.transition 2024, 10, :o5, 1728183600
+            tz.transition 2024, 10, :o5, 1729393200
             tz.transition 2025, 3, :o4, 1742090400
-            tz.transition 2025, 10, :o5, 1759633200
+            tz.transition 2025, 10, :o5, 1760842800
             tz.transition 2026, 3, :o4, 1773540000
-            tz.transition 2026, 10, :o5, 1791082800
+            tz.transition 2026, 10, :o5, 1792292400
             tz.transition 2027, 3, :o4, 1805594400
-            tz.transition 2027, 10, :o5, 1822532400
+            tz.transition 2027, 10, :o5, 1823742000
             tz.transition 2028, 3, :o4, 1837044000
-            tz.transition 2028, 10, :o5, 1853982000
+            tz.transition 2028, 10, :o5, 1855191600
             tz.transition 2029, 3, :o4, 1868493600
-            tz.transition 2029, 10, :o5, 1886036400
+            tz.transition 2029, 10, :o5, 1887246000
             tz.transition 2030, 3, :o4, 1899943200
-            tz.transition 2030, 10, :o5, 1917486000
+            tz.transition 2030, 10, :o5, 1918695600
             tz.transition 2031, 3, :o4, 1931392800
-            tz.transition 2031, 10, :o5, 1948935600
+            tz.transition 2031, 10, :o5, 1950145200
             tz.transition 2032, 3, :o4, 1963447200
-            tz.transition 2032, 10, :o5, 1980385200
+            tz.transition 2032, 10, :o5, 1981594800
             tz.transition 2033, 3, :o4, 1994896800
-            tz.transition 2033, 10, :o5, 2011834800
+            tz.transition 2033, 10, :o5, 2013044400
             tz.transition 2034, 3, :o4, 2026346400
-            tz.transition 2034, 10, :o5, 2043284400
+            tz.transition 2034, 10, :o5, 2044494000
             tz.transition 2035, 3, :o4, 2057796000
-            tz.transition 2035, 10, :o5, 2075338800
+            tz.transition 2035, 10, :o5, 2076548400
             tz.transition 2036, 3, :o4, 2089245600
-            tz.transition 2036, 10, :o5, 2106788400
+            tz.transition 2036, 10, :o5, 2107998000
             tz.transition 2037, 3, :o4, 2120695200
-            tz.transition 2037, 10, :o5, 2138238000
+            tz.transition 2037, 10, :o5, 2139447600
             tz.transition 2038, 3, :o4, 29586043, 12
-            tz.transition 2038, 10, :o5, 19725597, 8
+            tz.transition 2038, 10, :o5, 19725709, 8
             tz.transition 2039, 3, :o4, 29590411, 12
-            tz.transition 2039, 10, :o5, 19728509, 8
+            tz.transition 2039, 10, :o5, 19728621, 8
             tz.transition 2040, 3, :o4, 29594779, 12
-            tz.transition 2040, 10, :o5, 19731477, 8
+            tz.transition 2040, 10, :o5, 19731589, 8
             tz.transition 2041, 3, :o4, 29599147, 12
-            tz.transition 2041, 10, :o5, 19734389, 8
+            tz.transition 2041, 10, :o5, 19734501, 8
             tz.transition 2042, 3, :o4, 29603515, 12
-            tz.transition 2042, 10, :o5, 19737301, 8
+            tz.transition 2042, 10, :o5, 19737413, 8
             tz.transition 2043, 3, :o4, 29607883, 12
-            tz.transition 2043, 10, :o5, 19740213, 8
+            tz.transition 2043, 10, :o5, 19740325, 8
             tz.transition 2044, 3, :o4, 29612335, 12
-            tz.transition 2044, 10, :o5, 19743125, 8
+            tz.transition 2044, 10, :o5, 19743237, 8
             tz.transition 2045, 3, :o4, 29616703, 12
-            tz.transition 2045, 10, :o5, 19746037, 8
+            tz.transition 2045, 10, :o5, 19746149, 8
             tz.transition 2046, 3, :o4, 29621071, 12
-            tz.transition 2046, 10, :o5, 19749005, 8
+            tz.transition 2046, 10, :o5, 19749117, 8
             tz.transition 2047, 3, :o4, 29625439, 12
-            tz.transition 2047, 10, :o5, 19751917, 8
+            tz.transition 2047, 10, :o5, 19752029, 8
             tz.transition 2048, 3, :o4, 29629807, 12
-            tz.transition 2048, 10, :o5, 19754829, 8
+            tz.transition 2048, 10, :o5, 19754941, 8
             tz.transition 2049, 3, :o4, 29634259, 12
-            tz.transition 2049, 10, :o5, 19757741, 8
+            tz.transition 2049, 10, :o5, 19757853, 8
             tz.transition 2050, 3, :o4, 29638627, 12
           end
         end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Bogota.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Bogota.rb
index ef96435c6a..ef96435c6a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Bogota.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Bogota.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Caracas.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Caracas.rb
index 27392a540a..27392a540a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Caracas.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Caracas.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chicago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Chicago.rb
index 0996857cf0..0996857cf0 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chicago.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Chicago.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chihuahua.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Chihuahua.rb
index 1710b57c79..1710b57c79 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Chihuahua.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Chihuahua.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Denver.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Denver.rb
index 1c1efb5ff3..1c1efb5ff3 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Denver.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Denver.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Godthab.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Godthab.rb
index 1e05518b0d..1e05518b0d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Godthab.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Godthab.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Guatemala.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Guatemala.rb
index a2bf73401c..a2bf73401c 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Guatemala.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Guatemala.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Halifax.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Halifax.rb
index d25ae775b3..d25ae775b3 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Halifax.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Halifax.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Indiana/Indianapolis.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Indiana/Indianapolis.rb
index f1430f6c24..f1430f6c24 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Indiana/Indianapolis.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Indiana/Indianapolis.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Juneau.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Juneau.rb
index f646f3f54a..f646f3f54a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Juneau.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Juneau.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/La_Paz.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/La_Paz.rb
index 45c907899f..45c907899f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/La_Paz.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/La_Paz.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Lima.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Lima.rb
index af68ac29f7..af68ac29f7 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Lima.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Lima.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Los_Angeles.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Los_Angeles.rb
index 16007fd675..16007fd675 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Los_Angeles.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Los_Angeles.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mazatlan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Mazatlan.rb
index ba9e6efcf1..ba9e6efcf1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mazatlan.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Mazatlan.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mexico_City.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Mexico_City.rb
index 2347fce647..2347fce647 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Mexico_City.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Mexico_City.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Monterrey.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Monterrey.rb
index 5816a9eab1..5816a9eab1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Monterrey.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Monterrey.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/New_York.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/New_York.rb
index 7d802bd2de..7d802bd2de 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/New_York.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/New_York.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Phoenix.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Phoenix.rb
index b514e0c0f9..b514e0c0f9 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Phoenix.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Phoenix.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Regina.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Regina.rb
index ebdb68814a..ebdb68814a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Regina.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Regina.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Santiago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Santiago.rb
index 0287c9ebc4..0287c9ebc4 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Santiago.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Santiago.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Sao_Paulo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Sao_Paulo.rb
new file mode 100644
index 0000000000..0524f81c04
--- /dev/null
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Sao_Paulo.rb
@@ -0,0 +1,171 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Sao_Paulo
+        include TimezoneDefinition
+        
+        timezone 'America/Sao_Paulo' do |tz|
+          tz.offset :o0, -11188, 0, :LMT
+          tz.offset :o1, -10800, 0, :BRT
+          tz.offset :o2, -10800, 3600, :BRST
+          
+          tz.transition 1914, 1, :o1, 52274886397, 21600
+          tz.transition 1931, 10, :o2, 29119417, 12
+          tz.transition 1932, 4, :o1, 29121583, 12
+          tz.transition 1932, 10, :o2, 19415869, 8
+          tz.transition 1933, 4, :o1, 29125963, 12
+          tz.transition 1949, 12, :o2, 19466013, 8
+          tz.transition 1950, 4, :o1, 19467101, 8
+          tz.transition 1950, 12, :o2, 19468933, 8
+          tz.transition 1951, 4, :o1, 29204851, 12
+          tz.transition 1951, 12, :o2, 19471853, 8
+          tz.transition 1952, 4, :o1, 29209243, 12
+          tz.transition 1952, 12, :o2, 19474781, 8
+          tz.transition 1953, 3, :o1, 29213251, 12
+          tz.transition 1963, 10, :o2, 19506605, 8
+          tz.transition 1964, 3, :o1, 29261467, 12
+          tz.transition 1965, 1, :o2, 19510333, 8
+          tz.transition 1965, 3, :o1, 29266207, 12
+          tz.transition 1965, 12, :o2, 19512765, 8
+          tz.transition 1966, 3, :o1, 29270227, 12
+          tz.transition 1966, 11, :o2, 19515445, 8
+          tz.transition 1967, 3, :o1, 29274607, 12
+          tz.transition 1967, 11, :o2, 19518365, 8
+          tz.transition 1968, 3, :o1, 29278999, 12
+          tz.transition 1985, 11, :o2, 499748400
+          tz.transition 1986, 3, :o1, 511236000
+          tz.transition 1986, 10, :o2, 530593200
+          tz.transition 1987, 2, :o1, 540266400
+          tz.transition 1987, 10, :o2, 562129200
+          tz.transition 1988, 2, :o1, 571197600
+          tz.transition 1988, 10, :o2, 592974000
+          tz.transition 1989, 1, :o1, 602042400
+          tz.transition 1989, 10, :o2, 624423600
+          tz.transition 1990, 2, :o1, 634701600
+          tz.transition 1990, 10, :o2, 656478000
+          tz.transition 1991, 2, :o1, 666756000
+          tz.transition 1991, 10, :o2, 687927600
+          tz.transition 1992, 2, :o1, 697600800
+          tz.transition 1992, 10, :o2, 719982000
+          tz.transition 1993, 1, :o1, 728445600
+          tz.transition 1993, 10, :o2, 750826800
+          tz.transition 1994, 2, :o1, 761709600
+          tz.transition 1994, 10, :o2, 782276400
+          tz.transition 1995, 2, :o1, 793159200
+          tz.transition 1995, 10, :o2, 813726000
+          tz.transition 1996, 2, :o1, 824004000
+          tz.transition 1996, 10, :o2, 844570800
+          tz.transition 1997, 2, :o1, 856058400
+          tz.transition 1997, 10, :o2, 876106800
+          tz.transition 1998, 3, :o1, 888717600
+          tz.transition 1998, 10, :o2, 908074800
+          tz.transition 1999, 2, :o1, 919562400
+          tz.transition 1999, 10, :o2, 938919600
+          tz.transition 2000, 2, :o1, 951616800
+          tz.transition 2000, 10, :o2, 970974000
+          tz.transition 2001, 2, :o1, 982461600
+          tz.transition 2001, 10, :o2, 1003028400
+          tz.transition 2002, 2, :o1, 1013911200
+          tz.transition 2002, 11, :o2, 1036292400
+          tz.transition 2003, 2, :o1, 1045360800
+          tz.transition 2003, 10, :o2, 1066532400
+          tz.transition 2004, 2, :o1, 1076810400
+          tz.transition 2004, 11, :o2, 1099364400
+          tz.transition 2005, 2, :o1, 1108864800
+          tz.transition 2005, 10, :o2, 1129431600
+          tz.transition 2006, 2, :o1, 1140314400
+          tz.transition 2006, 11, :o2, 1162695600
+          tz.transition 2007, 2, :o1, 1172368800
+          tz.transition 2007, 10, :o2, 1192330800
+          tz.transition 2008, 2, :o1, 1203213600
+          tz.transition 2008, 10, :o2, 1224385200
+          tz.transition 2009, 2, :o1, 1234663200
+          tz.transition 2009, 10, :o2, 1255834800
+          tz.transition 2010, 2, :o1, 1266717600
+          tz.transition 2010, 10, :o2, 1287284400
+          tz.transition 2011, 2, :o1, 1298167200
+          tz.transition 2011, 10, :o2, 1318734000
+          tz.transition 2012, 2, :o1, 1330221600
+          tz.transition 2012, 10, :o2, 1350788400
+          tz.transition 2013, 2, :o1, 1361066400
+          tz.transition 2013, 10, :o2, 1382238000
+          tz.transition 2014, 2, :o1, 1392516000
+          tz.transition 2014, 10, :o2, 1413687600
+          tz.transition 2015, 2, :o1, 1424570400
+          tz.transition 2015, 10, :o2, 1445137200
+          tz.transition 2016, 2, :o1, 1456020000
+          tz.transition 2016, 10, :o2, 1476586800
+          tz.transition 2017, 2, :o1, 1487469600
+          tz.transition 2017, 10, :o2, 1508036400
+          tz.transition 2018, 2, :o1, 1518919200
+          tz.transition 2018, 10, :o2, 1540090800
+          tz.transition 2019, 2, :o1, 1550368800
+          tz.transition 2019, 10, :o2, 1571540400
+          tz.transition 2020, 2, :o1, 1581818400
+          tz.transition 2020, 10, :o2, 1602990000
+          tz.transition 2021, 2, :o1, 1613872800
+          tz.transition 2021, 10, :o2, 1634439600
+          tz.transition 2022, 2, :o1, 1645322400
+          tz.transition 2022, 10, :o2, 1665889200
+          tz.transition 2023, 2, :o1, 1677376800
+          tz.transition 2023, 10, :o2, 1697338800
+          tz.transition 2024, 2, :o1, 1708221600
+          tz.transition 2024, 10, :o2, 1729393200
+          tz.transition 2025, 2, :o1, 1739671200
+          tz.transition 2025, 10, :o2, 1760842800
+          tz.transition 2026, 2, :o1, 1771725600
+          tz.transition 2026, 10, :o2, 1792292400
+          tz.transition 2027, 2, :o1, 1803175200
+          tz.transition 2027, 10, :o2, 1823742000
+          tz.transition 2028, 2, :o1, 1834624800
+          tz.transition 2028, 10, :o2, 1855191600
+          tz.transition 2029, 2, :o1, 1866074400
+          tz.transition 2029, 10, :o2, 1887246000
+          tz.transition 2030, 2, :o1, 1897524000
+          tz.transition 2030, 10, :o2, 1918695600
+          tz.transition 2031, 2, :o1, 1928973600
+          tz.transition 2031, 10, :o2, 1950145200
+          tz.transition 2032, 2, :o1, 1960423200
+          tz.transition 2032, 10, :o2, 1981594800
+          tz.transition 2033, 2, :o1, 1992477600
+          tz.transition 2033, 10, :o2, 2013044400
+          tz.transition 2034, 2, :o1, 2024532000
+          tz.transition 2034, 10, :o2, 2044494000
+          tz.transition 2035, 2, :o1, 2055376800
+          tz.transition 2035, 10, :o2, 2076548400
+          tz.transition 2036, 2, :o1, 2086826400
+          tz.transition 2036, 10, :o2, 2107998000
+          tz.transition 2037, 2, :o1, 2118880800
+          tz.transition 2037, 10, :o2, 2139447600
+          tz.transition 2038, 2, :o1, 29585707, 12
+          tz.transition 2038, 10, :o2, 19725709, 8
+          tz.transition 2039, 2, :o1, 29590075, 12
+          tz.transition 2039, 10, :o2, 19728621, 8
+          tz.transition 2040, 2, :o1, 29594443, 12
+          tz.transition 2040, 10, :o2, 19731589, 8
+          tz.transition 2041, 2, :o1, 29598811, 12
+          tz.transition 2041, 10, :o2, 19734501, 8
+          tz.transition 2042, 2, :o1, 29603179, 12
+          tz.transition 2042, 10, :o2, 19737413, 8
+          tz.transition 2043, 2, :o1, 29607547, 12
+          tz.transition 2043, 10, :o2, 19740325, 8
+          tz.transition 2044, 2, :o1, 29611999, 12
+          tz.transition 2044, 10, :o2, 19743237, 8
+          tz.transition 2045, 2, :o1, 29616367, 12
+          tz.transition 2045, 10, :o2, 19746149, 8
+          tz.transition 2046, 2, :o1, 29620735, 12
+          tz.transition 2046, 10, :o2, 19749117, 8
+          tz.transition 2047, 2, :o1, 29625103, 12
+          tz.transition 2047, 10, :o2, 19752029, 8
+          tz.transition 2048, 2, :o1, 29629471, 12
+          tz.transition 2048, 10, :o2, 19754941, 8
+          tz.transition 2049, 2, :o1, 29633923, 12
+          tz.transition 2049, 10, :o2, 19757853, 8
+          tz.transition 2050, 2, :o1, 29638291, 12
+        end
+      end
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/St_Johns.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/St_Johns.rb
index e4a3599d35..e4a3599d35 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/St_Johns.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/St_Johns.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Tijuana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Tijuana.rb
index 423059da46..423059da46 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/America/Tijuana.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Tijuana.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Almaty.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Almaty.rb
index 9ee18970f1..9ee18970f1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Almaty.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Almaty.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baghdad.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Baghdad.rb
index 774dca1587..774dca1587 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baghdad.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Baghdad.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baku.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Baku.rb
index e86340ebfa..e86340ebfa 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baku.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Baku.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Bangkok.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Bangkok.rb
index 139194e5e5..139194e5e5 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Bangkok.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Bangkok.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Chongqing.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Chongqing.rb
index 8c94b4ba86..8c94b4ba86 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Chongqing.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Chongqing.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Colombo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Colombo.rb
index f6531fa819..f6531fa819 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Colombo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Colombo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Dhaka.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Dhaka.rb
index ccd0265503..ccd0265503 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Dhaka.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Dhaka.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Hong_Kong.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Hong_Kong.rb
index f1edd75ac8..f1edd75ac8 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Hong_Kong.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Hong_Kong.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Irkutsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Irkutsk.rb
index 2d47d9580b..2d47d9580b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Irkutsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Irkutsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jakarta.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Jakarta.rb
index cc58fa173b..cc58fa173b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jakarta.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Jakarta.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jerusalem.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Jerusalem.rb
index 9b737b899e..9b737b899e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Jerusalem.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Jerusalem.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kabul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kabul.rb
index 669c09790a..669c09790a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kabul.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kabul.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kamchatka.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kamchatka.rb
index 2f1690b3a9..2f1690b3a9 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kamchatka.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kamchatka.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Karachi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Karachi.rb
index bd7656ef2f..b906cc9893 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Karachi.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Karachi.rb
@@ -22,7 +22,7 @@ module TZInfo
           tz.transition 2002, 4, :o5, 1018119660
           tz.transition 2002, 10, :o4, 1033840860
           tz.transition 2008, 5, :o5, 1212260400
-          tz.transition 2008, 8, :o4, 1220205600
+          tz.transition 2008, 10, :o4, 1225476000
         end
       end
     end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Katmandu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Katmandu.rb
index 37dbea1f41..37dbea1f41 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Katmandu.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Katmandu.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kolkata.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kolkata.rb
index 1b6ffbd59d..1b6ffbd59d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kolkata.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kolkata.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Krasnoyarsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Krasnoyarsk.rb
index d6c503c155..d6c503c155 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Krasnoyarsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Krasnoyarsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuala_Lumpur.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kuala_Lumpur.rb
index 77a0c206fa..77a0c206fa 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuala_Lumpur.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kuala_Lumpur.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuwait.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kuwait.rb
index 5bd5283197..5bd5283197 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuwait.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Kuwait.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Magadan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Magadan.rb
index 302093693e..302093693e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Magadan.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Magadan.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Muscat.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Muscat.rb
index 604f651dfa..604f651dfa 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Muscat.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Muscat.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Novosibirsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Novosibirsk.rb
index a4e7796e75..a4e7796e75 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Novosibirsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Novosibirsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Rangoon.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Rangoon.rb
index 759b82d77a..759b82d77a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Rangoon.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Rangoon.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Riyadh.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Riyadh.rb
index 7add410620..7add410620 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Riyadh.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Riyadh.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Seoul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Seoul.rb
index 795d2a75df..795d2a75df 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Seoul.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Seoul.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Shanghai.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Shanghai.rb
index 34b13d59ae..34b13d59ae 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Shanghai.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Shanghai.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Singapore.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Singapore.rb
index b323a78f74..b323a78f74 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Singapore.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Singapore.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Taipei.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Taipei.rb
index 3ba12108fb..3ba12108fb 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Taipei.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Taipei.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tashkent.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Tashkent.rb
index c205c7934d..c205c7934d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tashkent.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Tashkent.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tbilisi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Tbilisi.rb
index 15792a5651..15792a5651 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tbilisi.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Tbilisi.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tehran.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Tehran.rb
index d8df964a46..d8df964a46 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tehran.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Tehran.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tokyo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Tokyo.rb
index 51c9e16421..51c9e16421 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tokyo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Tokyo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Ulaanbaatar.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Ulaanbaatar.rb
index 2854f5c5fd..2854f5c5fd 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Ulaanbaatar.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Ulaanbaatar.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Urumqi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Urumqi.rb
index d793ff1341..d793ff1341 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Urumqi.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Urumqi.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Vladivostok.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Vladivostok.rb
index bd9e3d60ec..bd9e3d60ec 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Vladivostok.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Vladivostok.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yakutsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Yakutsk.rb
index 56435a788f..56435a788f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yakutsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Yakutsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yekaterinburg.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Yekaterinburg.rb
index 8ef8df4a41..8ef8df4a41 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yekaterinburg.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Yekaterinburg.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yerevan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Yerevan.rb
index e7f160861f..e7f160861f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Yerevan.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Asia/Yerevan.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Azores.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Atlantic/Azores.rb
index 1bd16a75ac..1bd16a75ac 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Azores.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Atlantic/Azores.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Cape_Verde.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Atlantic/Cape_Verde.rb
index 61c8c15043..61c8c15043 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/Cape_Verde.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Atlantic/Cape_Verde.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/South_Georgia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Atlantic/South_Georgia.rb
index 6a4cbafb9f..6a4cbafb9f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Atlantic/South_Georgia.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Atlantic/South_Georgia.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Adelaide.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Adelaide.rb
index c5d561cc1e..c5d561cc1e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Adelaide.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Adelaide.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Brisbane.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Brisbane.rb
index dd85ddae94..dd85ddae94 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Brisbane.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Brisbane.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Darwin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Darwin.rb
index 17de88124d..17de88124d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Darwin.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Darwin.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Hobart.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Hobart.rb
index 11384b9840..11384b9840 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Hobart.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Hobart.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Melbourne.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Melbourne.rb
index c1304488ea..c1304488ea 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Melbourne.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Melbourne.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Perth.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Perth.rb
index d9e66f14a8..d9e66f14a8 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Perth.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Perth.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Sydney.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Sydney.rb
index 9062bd7c3c..9062bd7c3c 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Australia/Sydney.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Australia/Sydney.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Etc/UTC.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Etc/UTC.rb
index 28b2c6a04c..28b2c6a04c 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Etc/UTC.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Etc/UTC.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Amsterdam.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Amsterdam.rb
index 2d0c95c4bc..2d0c95c4bc 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Amsterdam.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Amsterdam.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Athens.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Athens.rb
index 4e21e535ca..4e21e535ca 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Athens.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Athens.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Belgrade.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Belgrade.rb
index 4dbd893d75..4dbd893d75 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Belgrade.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Belgrade.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Berlin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Berlin.rb
index de2e4d951c..721054236c 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Berlin.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Berlin.rb
@@ -31,7 +31,7 @@ module TZInfo
           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, 4, :o2, 29187379, 12
           tz.transition 1947, 5, :o3, 58375597, 24
           tz.transition 1947, 6, :o2, 4864731, 2
           tz.transition 1947, 10, :o1, 58379125, 24
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bratislava.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Bratislava.rb
index 7a731a0b6a..7a731a0b6a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bratislava.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Bratislava.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Brussels.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Brussels.rb
index 6b0a242944..6b0a242944 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Brussels.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Brussels.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bucharest.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Bucharest.rb
index 521c3c932e..521c3c932e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Bucharest.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Bucharest.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Budapest.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Budapest.rb
index 1f3a9738b7..1f3a9738b7 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Budapest.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Budapest.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Copenhagen.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Copenhagen.rb
index 47cbaf14a7..47cbaf14a7 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Copenhagen.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Copenhagen.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Dublin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Dublin.rb
index 0560bb5436..0560bb5436 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Dublin.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Dublin.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Helsinki.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Helsinki.rb
index 13a806bcc7..13a806bcc7 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Helsinki.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Helsinki.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Istanbul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Istanbul.rb
index 8306c47536..8306c47536 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Istanbul.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Istanbul.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Kiev.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Kiev.rb
index 513d3308be..513d3308be 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Kiev.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Kiev.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Lisbon.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Lisbon.rb
index 1c6d2a3d30..1c6d2a3d30 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Lisbon.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Lisbon.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Ljubljana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Ljubljana.rb
index a9828e6ef8..a9828e6ef8 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Ljubljana.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Ljubljana.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/London.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/London.rb
index 64ce41e900..64ce41e900 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/London.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/London.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Madrid.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Madrid.rb
index 1fb568239a..1fb568239a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Madrid.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Madrid.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Minsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Minsk.rb
index fa15816cc8..fa15816cc8 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Minsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Minsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Moscow.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Moscow.rb
index ef269b675b..ef269b675b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Moscow.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Moscow.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Paris.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Paris.rb
index e3236c0ba1..e3236c0ba1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Paris.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Paris.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Prague.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Prague.rb
index bcabee96c1..bcabee96c1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Prague.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Prague.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Riga.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Riga.rb
index 784837f758..784837f758 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Riga.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Riga.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Rome.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Rome.rb
index aa7b43d9d2..aa7b43d9d2 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Rome.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Rome.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sarajevo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Sarajevo.rb
index 068c5fe6ad..068c5fe6ad 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sarajevo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Sarajevo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Skopje.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Skopje.rb
index 10b71f285e..10b71f285e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Skopje.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Skopje.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sofia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Sofia.rb
index 38a70eceb9..38a70eceb9 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Sofia.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Sofia.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Stockholm.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Stockholm.rb
index 43db70fa61..43db70fa61 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Stockholm.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Stockholm.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Tallinn.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Tallinn.rb
index de5a8569f3..de5a8569f3 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Tallinn.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Tallinn.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vienna.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Vienna.rb
index 990aabab66..990aabab66 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vienna.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Vienna.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vilnius.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Vilnius.rb
index d89d095a75..d89d095a75 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Vilnius.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Vilnius.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Warsaw.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Warsaw.rb
index 7fa51c2691..7fa51c2691 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Warsaw.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Warsaw.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Zagreb.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Zagreb.rb
index ecdd903d28..ecdd903d28 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Europe/Zagreb.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Europe/Zagreb.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Auckland.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Auckland.rb
index a524fd6b6b..a524fd6b6b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Auckland.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Auckland.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Fiji.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Fiji.rb
index 5fe9bbd9a6..5fe9bbd9a6 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Fiji.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Fiji.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Guam.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Guam.rb
index d4c1a0a682..d4c1a0a682 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Guam.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Guam.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Honolulu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Honolulu.rb
index 204b226537..204b226537 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Honolulu.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Honolulu.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Majuro.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Majuro.rb
index 32adad92c1..32adad92c1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Majuro.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Majuro.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Midway.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Midway.rb
index 97784fcc10..97784fcc10 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Midway.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Midway.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Noumea.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Noumea.rb
index 70173db8ab..70173db8ab 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Noumea.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Noumea.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Pago_Pago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Pago_Pago.rb
index c8fcd7d527..c8fcd7d527 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Pago_Pago.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Pago_Pago.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Port_Moresby.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Port_Moresby.rb
index f06cf6d54f..f06cf6d54f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Port_Moresby.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Port_Moresby.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Tongatapu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Tongatapu.rb
index 7578d92f38..7578d92f38 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Pacific/Tongatapu.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/Pacific/Tongatapu.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/info_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/info_timezone.rb
index 001303c594..001303c594 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/info_timezone.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/info_timezone.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/linked_timezone.rb
index c757485b84..f8ec4fca87 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/linked_timezone.rb
@@ -36,7 +36,7 @@ module TZInfo
     
     # 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.
+    # 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)
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/linked_timezone_info.rb
index 8197ff3e81..8197ff3e81 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/linked_timezone_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/linked_timezone_info.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/offset_rationals.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/offset_rationals.rb
new file mode 100644
index 0000000000..b1f10b2b63
--- /dev/null
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/offset_rationals.rb
@@ -0,0 +1,98 @@
+#--
+# 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 'rational'
+require 'tzinfo/ruby_core_support'
+
+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 => RubyCoreSupport.rational_new!(-7,12), 
+      -48600 => RubyCoreSupport.rational_new!(-9,16),
+      -46800 => RubyCoreSupport.rational_new!(-13,24),
+      -45000 => RubyCoreSupport.rational_new!(-25,48),
+      -43200 => RubyCoreSupport.rational_new!(-1,2),
+      -41400 => RubyCoreSupport.rational_new!(-23,48),
+      -39600 => RubyCoreSupport.rational_new!(-11,24),
+      -37800 => RubyCoreSupport.rational_new!(-7,16),
+      -36000 => RubyCoreSupport.rational_new!(-5,12),
+      -34200 => RubyCoreSupport.rational_new!(-19,48),
+      -32400 => RubyCoreSupport.rational_new!(-3,8),
+      -30600 => RubyCoreSupport.rational_new!(-17,48),
+      -28800 => RubyCoreSupport.rational_new!(-1,3),
+      -27000 => RubyCoreSupport.rational_new!(-5,16),
+      -25200 => RubyCoreSupport.rational_new!(-7,24),
+      -23400 => RubyCoreSupport.rational_new!(-13,48),
+      -21600 => RubyCoreSupport.rational_new!(-1,4),
+      -19800 => RubyCoreSupport.rational_new!(-11,48),
+      -18000 => RubyCoreSupport.rational_new!(-5,24),
+      -16200 => RubyCoreSupport.rational_new!(-3,16),
+      -14400 => RubyCoreSupport.rational_new!(-1,6),
+      -12600 => RubyCoreSupport.rational_new!(-7,48),
+      -10800 => RubyCoreSupport.rational_new!(-1,8),
+       -9000 => RubyCoreSupport.rational_new!(-5,48),
+       -7200 => RubyCoreSupport.rational_new!(-1,12),
+       -5400 => RubyCoreSupport.rational_new!(-1,16),
+       -3600 => RubyCoreSupport.rational_new!(-1,24),
+       -1800 => RubyCoreSupport.rational_new!(-1,48),
+           0 => RubyCoreSupport.rational_new!(0,1),
+        1800 => RubyCoreSupport.rational_new!(1,48),
+        3600 => RubyCoreSupport.rational_new!(1,24),
+        5400 => RubyCoreSupport.rational_new!(1,16),
+        7200 => RubyCoreSupport.rational_new!(1,12),
+        9000 => RubyCoreSupport.rational_new!(5,48),
+       10800 => RubyCoreSupport.rational_new!(1,8),
+       12600 => RubyCoreSupport.rational_new!(7,48),
+       14400 => RubyCoreSupport.rational_new!(1,6),
+       16200 => RubyCoreSupport.rational_new!(3,16),
+       18000 => RubyCoreSupport.rational_new!(5,24),
+       19800 => RubyCoreSupport.rational_new!(11,48),
+       21600 => RubyCoreSupport.rational_new!(1,4),
+       23400 => RubyCoreSupport.rational_new!(13,48),
+       25200 => RubyCoreSupport.rational_new!(7,24),
+       27000 => RubyCoreSupport.rational_new!(5,16),
+       28800 => RubyCoreSupport.rational_new!(1,3),
+       30600 => RubyCoreSupport.rational_new!(17,48),
+       32400 => RubyCoreSupport.rational_new!(3,8),
+       34200 => RubyCoreSupport.rational_new!(19,48),
+       36000 => RubyCoreSupport.rational_new!(5,12),
+       37800 => RubyCoreSupport.rational_new!(7,16),
+       39600 => RubyCoreSupport.rational_new!(11,24),
+       41400 => RubyCoreSupport.rational_new!(23,48),
+       43200 => RubyCoreSupport.rational_new!(1,2),
+       45000 => RubyCoreSupport.rational_new!(25,48),
+       46800 => RubyCoreSupport.rational_new!(13,24),
+       48600 => RubyCoreSupport.rational_new!(9,16),
+       50400 => RubyCoreSupport.rational_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/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/ruby_core_support.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/ruby_core_support.rb
new file mode 100644
index 0000000000..9a0441206b
--- /dev/null
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/ruby_core_support.rb
@@ -0,0 +1,56 @@
+#--

+# Copyright (c) 2008 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 'rational'

+

+module TZInfo

+  

+  # Methods to support different versions of Ruby.

+  module RubyCoreSupport #:nodoc:

+  

+    # Use Rational.new! for performance reasons in Ruby 1.8.

+    # This has been removed from 1.9, but Rational performs better.        

+    if Rational.respond_to? :new!

+      def self.rational_new!(numerator, denominator = 1)

+        Rational.new!(numerator, denominator)

+      end

+    else

+      def self.rational_new!(numerator, denominator = 1)

+        Rational(numerator, denominator)

+      end

+    end

+    

+    # 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!

+      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)

+        DateTime.new!(ajd, of, sg)

+      end

+    else

+      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)

+        DateTime.new0(ajd, of, sg)

+      end

+    end

+  end

+end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/time_or_datetime.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/time_or_datetime.rb
index 264517f3ee..264517f3ee 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/time_or_datetime.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/time_or_datetime.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone.rb
index eeaa772d0f..f87fb6fb70 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone.rb
@@ -121,7 +121,7 @@ module TZInfo
       TimezoneProxy.new(identifier)
     end
     
-    # If identifier is nil calls super(), otherwise calls get. An identifier
+    # 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        
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_definition.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_definition.rb
index 39ca8bfa53..39ca8bfa53 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_definition.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_definition.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_info.rb
index 68e38c35fb..68e38c35fb 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_info.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_offset_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_offset_info.rb
index 6a0bbca46f..6a0bbca46f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_offset_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_offset_info.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_period.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_period.rb
index 00888fcfdc..00888fcfdc 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_period.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_period.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_transition_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_transition_info.rb
index 781764f0b0..6b0669cc4a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone_transition_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/timezone_transition_info.rb
@@ -37,7 +37,7 @@ module TZInfo
     attr_reader :numerator_or_time
     protected :numerator_or_time
     
-    # Either the denominator of the DateTime if the transition time is defined
+    # Either the denominotor of the DateTime if the transition time is defined
     # as a DateTime, otherwise nil. 
     attr_reader :denominator
     protected :denominator
@@ -70,17 +70,8 @@ module TZInfo
         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
-          
+          r = RubyCoreSupport.rational_new!(@numerator_or_time, @denominator)
+          dt = RubyCoreSupport.datetime_new!(r, 0, Date::ITALY)
           @at = TimeOrDateTime.new(dt)
         end
       end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/offset_rationals.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/offset_rationals.rb
deleted file mode 100644
index c79eedb7ef..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/offset_rationals.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#--
-# 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