Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 75c7ad38279974c1fc52fd5467f88357b97df847 https://github.com/phpmyadmin/phpmyadmin/commit/75c7ad38279974c1fc52fd5467f8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-08 (Thu, 08 May 2014)

Changed paths: M js/chart.js

Log Message: ----------- Define the factory method last so the chart classes are defined by then

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

Commit: 8f1fcd5e6e64fe85661f42dae5a2f6d6ffcd1850 https://github.com/phpmyadmin/phpmyadmin/commit/8f1fcd5e6e64fe85661f42dae5a2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-08 (Thu, 08 May 2014)

Changed paths: M libraries/Util.class.php M libraries/insert_edit.lib.php M test/classes/PMA_Table_test.php M test/classes/gis/PMA_GIS_Polygon_test.php M test/libraries/PMA_display_export_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ebefbfa1260f...8f1fcd5e6e64