[DRE-commits] [SCM] ruby-actionpack-3.2.git branch, master, updated. debian/3.2.6-4-5-g92ff314

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 92ff314fd63113a6af1f488d434e3235ac6ef528
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Jan 9 18:28:18 2013 -0300

    remove extra garbage at EOL's

diff --git a/debian/patches/CVE-2013-0155.patch b/debian/patches/CVE-2013-0155.patch
index ebc6501..94c581b 100644
--- a/debian/patches/CVE-2013-0155.patch
+++ b/debian/patches/CVE-2013-0155.patch
@@ -1,10 +1,10 @@
-From b7d666e95aee11e441908278425d16deef87cefb Mon Sep 17 00:00:00 2001
-From: Aaron Patterson <aaron.patterson at gmail.com>
-Date: Fri, 4 Jan 2013 12:02:22 -0800
-Subject: [PATCH 1/2] * Strip nils from collections on JSON and XML posts.
- [CVE-2013-0155] * dealing with empty hashes. Thanks
- Damien Mathieu
-
+From b7d666e95aee11e441908278425d16deef87cefb Mon Sep 17 00:00:00 2001
+From: Aaron Patterson <aaron.patterson at gmail.com>
+Date: Fri, 4 Jan 2013 12:02:22 -0800
+Subject: [PATCH 1/2] * Strip nils from collections on JSON and XML posts.
+ [CVE-2013-0155] * dealing with empty hashes. Thanks
+ Damien Mathieu
+
 --- a/lib/action_dispatch/http/request.rb
 +++ b/lib/action_dispatch/http/request.rb
 @@ -247,18 +247,14 @@ module ActionDispatch

-- 
ruby-actionpack-3.2.git