[gfal2-python/el6: 3/3] Merge branch 'master' into el6

[Alejandro Alvarez]

commit 1cb305470b07e26951b0a9ac6e44b72ffdd43335
Merge: fd0ec23 25fa2f9
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date:   Fri Feb 6 11:13:45 2015 +0100

    Merge branch 'master' into el6

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