Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b5c51cf040582e4e6bf445b9efe86df71e8586b1 https://github.com/phpmyadmin/phpmyadmin/commit/b5c51cf040582e4e6bf445b9efe8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-14 (Thu, 14 May 2015)

Changed paths: M import_status.php

Log Message: ----------- bug #4903 & bug #4367 Import status infinite loop

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

Commit: ef806b39e592290d32aa4a2cf9e59c37f924d4d2 https://github.com/phpmyadmin/phpmyadmin/commit/ef806b39e592290d32aa4a2cf9e5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-14 (Thu, 14 May 2015)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry for bug #4367

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

Commit: c2eefac419cdb2dfba8e1d911de5a41ab79deac4 https://github.com/phpmyadmin/phpmyadmin/commit/c2eefac419cdb2dfba8e1d911de5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-14 (Thu, 14 May 2015)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1c2e8246970f...c2eefac419cd