Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ff5e32553ed3667be236163445693fc604a88ac9 https://github.com/phpmyadmin/phpmyadmin/commit/ff5e32553ed3667be23616344569... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-12 (Wed, 12 Nov 2014)

Changed paths: M import.php

Log Message: ----------- Executing multiple SQLs - add missing parameter

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

Commit: 871d811bc7b1e3da2fd7a18b5caf16ab160975cb https://github.com/phpmyadmin/phpmyadmin/commit/871d811bc7b1e3da2fd7a18b5caf... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-12 (Wed, 12 Nov 2014)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry for bug #4585 commit ff5e32553ed3667be

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

Commit: a42b441b6e02a140fb4fb297ae19d529eaa2db57 https://github.com/phpmyadmin/phpmyadmin/commit/a42b441b6e02a140fb4fb297ae19... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-12 (Wed, 12 Nov 2014)

Changed paths: M ChangeLog M db_central_columns.php M export.php M js/menu-resizer.js M js/rte.js M libraries/replication.inc.php M libraries/structure.lib.php

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

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/41df743274ab...a42b441b6e02