101a48e Merge branch 'master' of ssh://pkgs.fedoraproject.org/vfrnav

Merged and Committed by sailer 11 years ago
1 file changed. 6 lines added. 1 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/vfrnav
    
    Conflicts:
    	vfrnav.spec
    
        
file modified
+6 -1