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

[Alejandro Alvarez]

commit 57cefd44a8b7a9cb65544ec7422e0701a83e569c
Merge: 900c6e3 449f386
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Mon Dec 8 10:57:59 2014 +0100

    Merge branch 'master' into epel7

 .gitignore                      |    2 ++
 gfal2-srm-patch-set-error.patch |   15 +++++++++++++++
 gfal2.spec                      |    8 +++++++-
 3 files changed, 24 insertions(+), 1 deletions(-)
---