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

[Alejandro Alvarez]

commit fd0ec23ba37249d40c3f25379588f03ce80a6269
Merge: 8ba4644 fcc4ee7
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Nov 7 14:14:07 2014 +0100

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

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