Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bb982053899718f94471ce3f5728ab963c11dda3 https://github.com/phpmyadmin/phpmyadmin/commit/bb982053899718f94471ce3f5728... Author: Marc Delisle marc@infomarc.info Date: 2012-08-13 (Mon, 13 Aug 2012)

Changed paths: M js/db_structure.js

Log Message: ----------- Fix merge conflicts for security patch