d1d56f5 Merge branch 'master' into el6

Merged and Committed by Alejandro Alvarez Ayllon 9 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	dpm-xrootd.spec
    	sources
    
        
file modified
+38 -19
file modified
+1 -1