[gfal2-python/epel7: 6/6] Merge branch 'master' into epel7

[Alejandro Alvarez]

commit dafd0ba5bf342e2d4f5899c78fa8d17daffd5104
Merge: b48ae37 fcc4ee7
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Nov 7 14:13:17 2014 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	gfal2-python.spec
    	sources

 gfal2-python.spec |   22 ++++++++++++++++++----
 sources           |    2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)
---