[gfal2/f20: 2/2] Merge branch 'master' into f20

[Alejandro Alvarez]

commit a549b800e27fa008baf337034fa3ea24162e36fe
Merge: 6d5e970 80f03df
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Mon Nov 17 13:55:08 2014 +0100

    Merge branch 'master' into f20

 gfal2-srm-honor-protocol.patch |  100 ----------------------------------------
 gfal2.spec                     |   17 ++----
 sources                        |    2 +-
 3 files changed, 7 insertions(+), 112 deletions(-)
---