Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3821b724cc5d105b06bbdb5f34705d2407dd2d8a https://github.com/phpmyadmin/phpmyadmin/commit/3821b724cc5d105b06bbdb5f3470... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)

Changed paths: M db_central_columns.php M libraries/central_columns.lib.php

Log Message: ----------- Move col_extra handling code to a single method. Add such missing col_extra handling.

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

Commit: 0c83b29313c8c2d999cee14ca30249cecda2e06a https://github.com/phpmyadmin/phpmyadmin/commit/0c83b29313c8c2d999cee14ca302... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)

Changed paths: M po/ar.po M po/en_GB.po M po/es.po M po/ia.po M po/pt_BR.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f5580dc46a09...0c83b29313c8