[drupal7/el5] Merge EL5 into master branch

[Peter Borsa]

commit 40513a2eb0aac7cfd1226ff77e89b9de76a6ee1e
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Sat Aug 10 21:39:32 2013 +0200

    Merge EL5 into master branch

 drupal7.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/drupal7.spec b/drupal7.spec
index b0919e6..fad02f4 100644
--- a/drupal7.spec
+++ b/drupal7.spec
@@ -27,12 +27,8 @@ Patch1:  drupal-7.14-CVE-2012-2922.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-<<<<<<< HEAD
-Requires: php53, php53-gd, php53-mbstring, wget, php53-pdo, php53-xml
-=======
 Requires: php, php-gd, php-mbstring, wget, php-pdo, php-xml
 Requires: crontabs
->>>>>>> master
 
 # Virtual provides
 ## Core