831de40 Merge branch 'master' of ssh://pkgs.fedoraproject.org/esorex

Merged and Committed by Sergio Pascual 10 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/esorex
    
    Conflicts:
    	esorex.spec
    
        
file modified
+3 -0