Merged updates from trunk into stable branch

[feedcatcher.git] / vendor / rails / activesupport / lib / active_support / vendor.rb

diff --git a/vendor/rails/activesupport/lib/active_support/vendor.rb b/vendor/rails/activesupport/lib/active_support/vendor.rb
new file mode 100644 (file)
index 0000000..28852e6
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor.rb
@@ -0,0 +1,29 @@
+# Prefer gems to the bundled libs.
+require 'rubygems'
+
+begin
+  gem 'builder', '~> 2.1.2'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
+end
+require 'builder'
+
+begin
+  gem 'memcache-client', '>= 1.6.5'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.6.5"
+end
+
+begin
+  gem 'tzinfo', '~> 0.3.12'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12"
+end
+
+# TODO I18n gem has not been released yet
+# begin
+#   gem 'i18n', '~> 0.1.3'
+# rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
+  require 'i18n'
+# end