[drupal6: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/drupal6

[Jon Ciesla]

commit 486a3fc859cfdbe5726331275a7d79f235b98c2f
Merge: 20bb550 163d236
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jul 17 06:55:53 2014 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/drupal6
    
    Conflicts:
    	drupal6.spec

 drupal6.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc drupal6.spec
index bf044f1,39d4a09..d468130
--- a/drupal6.spec
+++ b/drupal6.spec
@@@ -81,9 -81,9 +81,13 @@@ rm -rf %{buildroot
  %dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/files/default/
  
  %changelog
++<<<<<<< HEAD
 +* Thu Jul 17 2014 Jon Ciesla <limburgher at gmail.com> - 6.32-1
 +- 6.32, SA-CORE-2014-003
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.31-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Thu Apr 17 2014 Jon Ciesla <limburgher at gmail.com> - 6.31-1
  - 6.31, BZ 1088846.