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/Asia/Colombo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Colombo.rb
new file mode 100644
index 0000000000..f6531fa819
--- /dev/null
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Colombo.rb
@@ -0,0 +1,30 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Colombo
+        include TimezoneDefinition
+        
+        timezone 'Asia/Colombo' do |tz|
+          tz.offset :o0, 19164, 0, :LMT
+          tz.offset :o1, 19172, 0, :MMT
+          tz.offset :o2, 19800, 0, :IST
+          tz.offset :o3, 19800, 1800, :IHST
+          tz.offset :o4, 19800, 3600, :IST
+          tz.offset :o5, 23400, 0, :LKT
+          tz.offset :o6, 21600, 0, :LKT
+          
+          tz.transition 1879, 12, :o1, 17335550003, 7200
+          tz.transition 1905, 12, :o2, 52211763607, 21600
+          tz.transition 1942, 1, :o3, 116657485, 48
+          tz.transition 1942, 8, :o4, 9722413, 4
+          tz.transition 1945, 10, :o2, 38907909, 16
+          tz.transition 1996, 5, :o5, 832962600
+          tz.transition 1996, 10, :o6, 846266400
+          tz.transition 2006, 4, :o2, 1145039400
+        end
+      end
+    end
+  end
+end