[fts/epel7: 2/2] Merge branch 'master' into epel7

[Alejandro Alvarez]

commit 288826b5643bfa8fad2be833599f41278d1da592
Merge: b5e792d c8eab8f
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Wed Nov 26 10:24:03 2014 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	fts.spec

 .gitignore |    7 +------
 fts.spec   |   36 +++++++++++++-----------------------
 sources    |    2 +-
 3 files changed, 15 insertions(+), 30 deletions(-)
---
diff --cc fts.spec
index c5b84a1,c104d9c..c199f59
--- a/fts.spec
+++ b/fts.spec
@@@ -446,10 -433,15 +433,13 @@@ f
  %{_datadir}/selinux/*/fts.pp
  
  %changelog
+ * Wed Nov 26 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 3.2.30-1
+ - Update for new upstream release
+ 
  * Thu Sep 04 2014 Orion Poplawski <orion at cora.nwra.com> - 3.2.26.2-4
 -- Rebuild for pugixml 1.4
 -
 +  - Rebuild for pugixml 1.4
  * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.26.2-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 -
 +  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
  * Wed Aug 13 2014 Michal Simon <michal.simon at cern.ch> - 3.2.26.2-2
    - Update for new upstream releas
  * Tue Feb 04 2014 Alejandro Alvarez <aalvarez at cern.ch> - 3.2.26-1