Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: aa9700de689f79ba74239481f2a35068762fca66 https://github.com/phpmyadmin/phpmyadmin/commit/aa9700de689f79ba74239481f2a3... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-11-08 (Sat, 08 Nov 2014)

Changed paths: M libraries/plugins/import/ImportSql.class.php

Log Message: ----------- Replace parameters by class attributes.

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

Commit: 458afb039192560ae18bedc06558082d46269222 https://github.com/phpmyadmin/phpmyadmin/commit/458afb039192560ae18bedc06558... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-11-08 (Sat, 08 Nov 2014)

Changed paths: M ChangeLog M libraries/tracking.lib.php M test/libraries/PMA_tbl_tracking_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/065397cd8450...458afb039192