4062de4 Merge remote-tracking branch 'origin/master' into kk-el5

Merged and Committed by kkeithle 10 years ago
1 file changed. 111 lines added. 81 lines removed.
    Merge remote-tracking branch 'origin/master' into kk-el5
    
    Conflicts:
    	glusterfs.spec
    
        
file modified
+111 -81