Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 279439b08a671e8cfa4ec69890690a09b20ba79a https://github.com/phpmyadmin/phpmyadmin/commit/279439b08a671e8cfa4ec6989069... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-15 (Fri, 15 May 2015)

Changed paths: M libraries/config/ServerConfigChecks.class.php

Log Message: ----------- Include token in the error messages

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

Commit: 3920c52409f9373b2accdd23650daf4e1e32d701 https://github.com/phpmyadmin/phpmyadmin/commit/3920c52409f9373b2accdd23650d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-15 (Fri, 15 May 2015)

Changed paths: M po/zh_TW.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/350f74aa930d...3920c52409f9