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

Changed paths: M libraries/common.inc.php

Log Message: ----------- Do not try to auto configure pma tables if PMA_MINIMUM_COMMON is defined

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

Commit: 88cc79896a54efef3faf54842a3425fc2e6890af https://github.com/phpmyadmin/phpmyadmin/commit/88cc79896a54efef3faf54842a34... Author: Marc Delisle marc@infomarc.info Date: 2015-01-07 (Wed, 07 Jan 2015)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: ef91568746fe13db612640921694fb6a3ce01ba8 https://github.com/phpmyadmin/phpmyadmin/commit/ef91568746fe13db612640921694... Author: Marc Delisle marc@infomarc.info Date: 2015-01-07 (Wed, 07 Jan 2015)

Changed paths: M ChangeLog

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ea6e33af0ad1...ef91568746fe