Merge commit 'origin/master' into savepoints

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

1 files changed, 30 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Phoenix.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Phoenix.rb
new file mode 100644
index 0000000000..b514e0c0f9
--- /dev/null
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Phoenix.rb
@@ -0,0 +1,30 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module America
+      module Phoenix
+        include TimezoneDefinition
+        
+        timezone 'America/Phoenix' do |tz|
+          tz.offset :o0, -26898, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -25200, 3600, :MDT
+          tz.offset :o3, -25200, 3600, :MWT
+          
+          tz.transition 1883, 11, :o1, 57819199, 24
+          tz.transition 1918, 3, :o2, 19373471, 8
+          tz.transition 1918, 10, :o1, 14531363, 6
+          tz.transition 1919, 3, :o2, 19376383, 8
+          tz.transition 1919, 10, :o1, 14533547, 6
+          tz.transition 1942, 2, :o3, 19443199, 8
+          tz.transition 1944, 1, :o1, 3500770681, 1440
+          tz.transition 1944, 4, :o3, 3500901781, 1440
+          tz.transition 1944, 10, :o1, 3501165241, 1440
+          tz.transition 1967, 4, :o2, 19516887, 8
+          tz.transition 1967, 10, :o1, 14638757, 6
+        end
+      end
+    end
+  end
+end