3473669 Merge branch 'f21' of ssh://pkgs.fedoraproject.org/freeciv into f21

Merged and Committed by limb 9 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/freeciv into f21
    
    Conflicts:
    	freeciv.spec
    
        
file modified
+3 -0