504190d Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ImageMagick

Merged and Committed by mooninite 6 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ImageMagick
    
    # Conflicts:
    #	ImageMagick.spec
    
        
file modified
+4 -1