397ae25 Merge branch 'master' of ssh://pkgs.fedoraproject.org/community-mysql

Merged and Committed by hhorak 7 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/community-mysql
    
    Conflicts:
    	community-mysql.spec
    
        
file modified
+5 -2