00835fe Merge branch 'master' of ssh://pkgs.fedoraproject.org/opencryptoki

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