Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 902b41e86cbbccab50abe75cfde0b0751eedb593 https://github.com/phpmyadmin/phpmyadmin/commit/902b41e86cbbccab50abe75cfde0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-16 (Wed, 16 Mar 2016)

Changed paths: M ChangeLog M libraries/controllers/database/DatabaseStructureController.php

Log Message: ----------- Fix #12092 PHP Fatal error: Call to undefined function __()

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

Commit: 251cd5d071b194720a931cc2aa5591553fe3872b https://github.com/phpmyadmin/phpmyadmin/commit/251cd5d071b194720a931cc2aa55... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-16 (Wed, 16 Mar 2016)

Changed paths: M ChangeLog M libraries/controllers/database/DatabaseStructureController.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/46dee5d1eb6d...251cd5d071b1