b19a1a6 Merge branch 'master' of ssh://pkgs.fedoraproject.org/tkimg

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