Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cb18ec2320592a7adba33187ad139772eef04c45 https://github.com/phpmyadmin/phpmyadmin/commit/cb18ec2320592a7adba33187ad13... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-21 (Wed, 21 Jan 2015)

Changed paths: M ChangeLog M libraries/Response.class.php

Log Message: ----------- bug #4700 Error text: Internal Server Error

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

Commit: 9cdcd992b10493bd9bb01d27bd4274f5127e34f0 https://github.com/phpmyadmin/phpmyadmin/commit/9cdcd992b10493bd9bb01d27bd42... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-21 (Wed, 21 Jan 2015)

Changed paths: M ChangeLog M libraries/Response.class.php

Log Message: ----------- Merge branch 'QA_4_3'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/888a58ff0c57...9cdcd992b104