[gfal2-python/f21: 2/2] Merge branch 'f20' into f21

[Alejandro Alvarez]

commit 27909f20e3530d9ff4f32c9a1621062ca89e6a1a
Merge: 8d6d71b ee82641
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date:   Tue Jul 22 09:54:10 2014 +0200

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

 gfal2-python.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---