0e5f5fa Merge branch 'f18' into el6

Merged and Committed by hhorak 11 years ago
1 file changed. 3 lines added. 9 lines removed.
    Merge branch 'f18' into el6
    
    Conflicts:
    	mariadb.spec
    
        
file modified
+3 -9