[gfal2-python/f20: 4/4] Merge branch 'master' into f20

[Alejandro Alvarez]

commit 92c2417bdba343f05c71eb80855959515c90e854
Merge: 98302fe 25fa2f9
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date:   Fri Feb 6 10:53:54 2015 +0100

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

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