Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3a52629431a61f9fe85cace604733f984159709c https://github.com/phpmyadmin/phpmyadmin/commit/3a52629431a61f9fe85cace60473... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-13 (Wed, 13 May 2015)

Changed paths: M js/messages.php M js/tbl_operations.js

Log Message: ----------- COALESCE does not require confirmation since it does not affect data

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 8bacbf312a9700ecd40a2661d6133cd6a15bfbe1 https://github.com/phpmyadmin/phpmyadmin/commit/8bacbf312a9700ecd40a2661d613... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-13 (Wed, 13 May 2015)

Changed paths: M libraries/DisplayResults.class.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/94a226c092bb...8bacbf312a97