[drupal7/el5: 4/5] 7.20

[Paul W. Frields]

commit 2f6f1feba3c409f3a960b65e79c683a445c3d55d
Author: Paul W. Frields <stickster at gmail.com>
Date:   Thu Feb 21 12:40:33 2013 +0100

    7.20

 .gitignore   |    1 +
 drupal7.spec |   10 +++++-----
 sources      |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b52d660..2bb9db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /drupal-7.17.tar.gz
 /drupal-7.18.tar.gz
 /drupal-7.19.tar.gz
+/drupal-7.20.tar.gz
diff --git a/drupal7.spec b/drupal7.spec
index 832c4e5..7b65fdd 100644
--- a/drupal7.spec
+++ b/drupal7.spec
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal7
 Name: drupal7
-Version:  7.19
-Release:  2%{?dist}
+Version:  7.20
+Release:  1%{?dist}
 Summary: An open-source content-management platform
 
 Group: Applications/Publishing
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/files/default/
 
 %changelog
+* Thu Feb 21 2013 Paul W. Frields <stickster at gmail.com> - 7.20-1
+- 7.20, SA-CORE-2013-002 (#913403)
+
 * Fri Jan 25 2013 Jon Ciesla <limburgher at gmail.com> - 7.19-2
 - README update for cron_key, BZ 902234.
 
@@ -103,15 +106,12 @@ rm -rf %{buildroot}
 * Thu Nov 8 2012 Peter Borsa <peter.borsa at gmail.com> - 7.17-1
 - New upstream.
 
-<<<<<<< HEAD
-=======
 * Wed Oct 31 2012 Jon Ciesla <limburgher at gmail.com> - 7.16-3
 - Fix conf.
 
 * Tue Oct 30 2012 Jon Ciesla <limburgher at gmail.com> - 7.16-2
 - Fix for httpd 2.4, BZ 871394.
 
->>>>>>> el6
 * Wed Oct 16 2012 Orion Poplawski <orion at cora.nwra.com> - 7.16-1
 - New upstream - SA-CORE-2012-003 security update
 
diff --git a/sources b/sources
index fde897f..d9acf3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c1dd3960f1555df208c80ef612e0c53a  drupal-7.19.tar.gz
+ee576d63f1fd8a1f1c072a56978da0c5  drupal-7.20.tar.gz