From: Tom Hughes <tom@compton.nu>
Date: Thu, 12 Mar 2009 00:13:27 +0000 (+0000)
Subject: Merged 14009:14059 from trunk.
X-Git-Tag: live~7573^2~58
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70?hp=81835c55a027e4b5dda06a2d5e1107315f1bf24d

Merged 14009:14059 from trunk.
---

diff --git a/config/environment.rb b/config/environment.rb
index b3481c024..ce1216b83 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -46,7 +46,7 @@ Rails::Initializer.run do |config|
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "aws-s3", :lib => "aws/s3"
   config.gem 'composite_primary_keys', :version => '1.1.0'
-  config.gem 'libxml-ruby', :version => '>= 1.0.0', :lib => 'libxml'
+  config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'mysql'