ba44c95 Rebase to version 10.0.17

Authored and Committed by hhorak 9 years ago
    Rebase to version 10.0.17
    
    Conflicts:
    	mariadb.spec
    
        
file modified
+1 -0
file modified
+5 -4
file modified
+1 -1