[drupal7-webform/el6: 4/4] Merge branch 'master' into el6

[Peter Borsa]

commit 2c7d3acf2d5cc8805618e0dc1799a08aa7530d13
Merge: 0dd54c3 63c386c
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Tue Nov 25 12:37:17 2014 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	drupal7-webform.spec
    	sources

 .gitignore           |    4 ++++
 drupal7-webform.spec |   22 +++++++++++++++++++++-
 sources              |    4 ++++
 3 files changed, 29 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 8cbe160,62a620a..59169cc
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,6 @@@
  /webform-7.x-4.0-beta1.tar.gz
  /webform-7.x-4.0-beta3.tar.gz
++<<<<<<< HEAD
++=======
+ /webform-7.x-4.1.tar.gz
++>>>>>>> master
diff --cc drupal7-webform.spec
index 40afa08,bf159bb..c059702
--- a/drupal7-webform.spec
+++ b/drupal7-webform.spec
@@@ -1,11 -1,10 +1,18 @@@
  %{?drupal7_find_provides_and_requires}
  
  %global module_name webform
++<<<<<<< HEAD
 +%global prerelease beta3
 +
 +Name:          drupal7-%{module_name}
 +Version:       4.0
 +Release:       0.3.%{prerelease}%{?dist}
++=======
+ 
+ Name:          drupal7-%{module_name}
+ Version:       4.1
+ Release:       1%{?dist}
++>>>>>>> master
  Summary:       Webform is the module for making surveys in Drupal
  
  Group:         Applications/Publishing
@@@ -65,12 -65,16 +72,25 @@@ cp -pr * %{buildroot}%{drupal7_modules}
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Tue Nov 25 2014 Peter Borsa <peter.borsa at gmail.com> 4.1-1
+ - Update to 4.1
+ - Release notes can be found at https://www.drupal.org/node/2351973
+ 
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-0.3.beta3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
++>>>>>>> master
  * Fri Mar 14 2014 Peter Borsa <peter.borsa at gmail.com> 4.0-0.2.beta3
  - Update to 4.0-beta3
  - Release notes can be found at https://drupal.org/node/2196069
  
++<<<<<<< HEAD
 +* Fri Feb 28 2014 Peter Borsa <peter.borsa at gmail.com> 4.0-0.2.beta1
 +- Remove php-pecl(zip) dependency
 +
++=======
++>>>>>>> master
  * Sat Jan 11 2014 Peter Borsa <peter.borsa at gmail.com> 4.0-0.1.beta1
  - Initial package
diff --cc sources
index 2132456,42be8cb..d86c76e
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +ed5a9f251b148852a8604d3a27d312d0  webform-7.x-4.0-beta3.tar.gz
++=======
+ e33d9a244c41c7b1bc6df8af00e08b7a  webform-7.x-4.1.tar.gz
++>>>>>>> master