78d5351 Merge branch 'master' of ssh://pkgs.fedoraproject.org/gitolite3

Merged and Committed by limb 9 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gitolite3
    
    Conflicts:
    	gitolite3.spec
    
        
file modified
+3 -0