02b33a7 Merge branch 'el5' into el6

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