[packages/percona-server/test-merge: 14/14] Merge remote-tracking branch 'remotes/mysql/MYSQL_5_6'

[glen]

commit 3f9db001d66dea8ecc4912a033a20aa9bae752b7
Merge: d8dc640 ef0e4cb
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 12 09:07:28 2016 +0300

    Merge remote-tracking branch 'remotes/mysql/MYSQL_5_6'
    
    Conflicts:
    	percona-server.spec

 mysqld.conf | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/3f9db001d66dea8ecc4912a033a20aa9bae752b7