[fts-monitoring/el6: 2/2] Merge branch 'master' into el6

[Alejandro Alvarez]

commit f0e15c8f5b219730d34e4466b1313712cd7df66d
Merge: b1ffe7a 649dafe
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Wed Nov 26 15:29:47 2014 +0100

    Merge branch 'master' into el6

 .gitignore          |    5 +----
 fts-monitoring.spec |   14 ++++++++------
 sources             |    2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)
---