52fb1e0 Merge branch 'master' of ssh://pkgs.fedoraproject.org/flam3

Merged and Committed by Ian Weller 12 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/flam3
    
    Conflicts:
    	flam3.spec
    
        
file modified
+3 -0