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

[MIchal Simon]

commit a56ecb835fa924f12adba52a6cfd4e4dd423a690
Merge: c533081 a77d234
Author: simonm <michal.simon at cern.ch>
Date:   Tue May 13 14:27:08 2014 +0200

    Merge branch 'master' into el6

 fts-monitoring-3.2.25-1.el6.src.rpm |  Bin 0 -> 56169 bytes
 fts-monitoring-3.2.25.tar.gz        |  Bin 0 -> 51932 bytes
 fts-monitoring.spec                 |   36 +++++++++-------------------------
 3 files changed, 10 insertions(+), 26 deletions(-)
---