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

[Alejandro Alvarez]

commit a7b2e11d911a4d2ec2554f95497d1beb5f5fb933
Merge: f0e15c8 27eb507
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date:   Fri Mar 6 09:20:16 2015 +0100

    Merge branch 'master' into el6

 fts-monitoring.spec | 8 +++++---
 sources             | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)
---