[fts/f21: 15/15] Merge branch 'master' into f21

[Alejandro Alvarez]

commit 4a237242eb57bb2551c5213ed3b61e8bde0e84e6
Merge: 54e2d3b 288826b
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Wed Nov 26 11:27:45 2014 +0100

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

 .gitignore        |    6 +----
 fts-3.2.25.tar.gz |  Bin 2644828 -> 0 bytes
 fts.spec          |   69 ++++++++++++++++++++--------------------------------
 sources           |    2 +-
 4 files changed, 29 insertions(+), 48 deletions(-)
---