From 57c77fcd0ae20ac554673f4ac73e8b1d6960567a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Tue, 11 Sep 2012 20:34:36 +0200
Subject: [PATCH] bump nokogiri

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 697034b85..6db4157f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -80,7 +80,7 @@ gem 'rails-i18n'
 
 # parsing
 
-gem 'nokogiri', '1.5.2'
+gem 'nokogiri', '1.5.5'
 gem 'redcarpet', "2.1.1"
 gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
 gem 'ruby-oembed', '0.8.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c9f03c7d..a5b2f8acb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -284,7 +284,7 @@ GEM
       net-ssh (>= 1.99.1)
     netrc (0.7.7)
     newrelic_rpm (3.3.5)
-    nokogiri (1.5.2)
+    nokogiri (1.5.5)
     oauth (0.4.6)
     oauth2 (0.6.1)
       faraday (~> 0.7)
@@ -502,7 +502,7 @@ DEPENDENCIES
   mobile-fu (= 1.1.0)
   mysql2 (= 0.3.11)
   newrelic_rpm (= 3.3.5)
-  nokogiri (= 1.5.2)
+  nokogiri (= 1.5.5)
   oink (= 0.9.3)
   omniauth (= 1.1.1)
   omniauth-facebook (= 1.3.0)