Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0d109ac8249ea5ea56a00d257b4aeabe2b83bed8 https://github.com/phpmyadmin/phpmyadmin/commit/0d109ac8249ea5ea56a00d257b4a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-20 (Mon, 20 Apr 2015)

Changed paths: R libraries/plugins/transformations/Text_Plain_BinaryToIP.class.php A libraries/plugins/transformations/output/Text_Plain_BinaryToIP.class.php M test/libraries/PMA_transformation_test.php

Log Message: ----------- This is only a output transformation

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

Commit: 15caf48a9aca80682aeef6f7594544e1c336b4df https://github.com/phpmyadmin/phpmyadmin/commit/15caf48a9aca80682aeef6f75945... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-20 (Mon, 20 Apr 2015)

Changed paths: M ChangeLog M doc/config.rst M js/tbl_structure.js M libraries/DisplayResults.class.php M libraries/bookmark.lib.php M libraries/sql_query_form.lib.php M libraries/structure.lib.php M po/cs.po M po/tr.po M test/libraries/PMA_PMD_common_test.php M view_operations.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6e7386ee9195...15caf48a9aca