Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5c9aa93c904fcf063fcd975a6b70d3cbae9dd934 https://github.com/phpmyadmin/phpmyadmin/commit/5c9aa93c904fcf063fcd975a6b70... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-04-17 (Thu, 17 Apr 2014)

Changed paths: M libraries/config/FormDisplay.class.php

Log Message: ----------- Fix coding style.

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: ccf55163a825ce9ea57cefe17ba547eb6200d25a https://github.com/phpmyadmin/phpmyadmin/commit/ccf55163a825ce9ea57cefe17ba5... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-04-17 (Thu, 17 Apr 2014)

Changed paths: M import_status.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/92b950db85ea...ccf55163a825