Merge commit 'origin/master' into savepoints

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

1 files changed, 29 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Darwin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Darwin.rb
new file mode 100644
index 0000000000..17de88124d
--- /dev/null
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Darwin.rb
@@ -0,0 +1,29 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Australia
+      module Darwin
+        include TimezoneDefinition
+        
+        timezone 'Australia/Darwin' do |tz|
+          tz.offset :o0, 31400, 0, :LMT
+          tz.offset :o1, 32400, 0, :CST
+          tz.offset :o2, 34200, 0, :CST
+          tz.offset :o3, 34200, 3600, :CST
+          
+          tz.transition 1895, 1, :o1, 1042513259, 432
+          tz.transition 1899, 4, :o2, 19318201, 8
+          tz.transition 1916, 12, :o3, 3486569911, 1440
+          tz.transition 1917, 3, :o2, 116222983, 48
+          tz.transition 1941, 12, :o3, 38885763, 16
+          tz.transition 1942, 3, :o2, 116661463, 48
+          tz.transition 1942, 9, :o3, 38890067, 16
+          tz.transition 1943, 3, :o2, 116678935, 48
+          tz.transition 1943, 10, :o3, 38896003, 16
+          tz.transition 1944, 3, :o2, 116696407, 48
+        end
+      end
+    end
+  end
+end