c3532d8 Merge branch 'master' into el6

Merged and Committed by limb 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	gitolite.spec
    
        
file modified
+4 -0
file modified
+8 -43
file modified
+7 -0
file modified
+16 -4
file modified
+1 -1