Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3b89a4650af38e8c24f7eff94c76950fd41f8e0c https://github.com/phpmyadmin/phpmyadmin/commit/3b89a4650af38e8c24f7eff94c76... Author: Marc Delisle marc@infomarc.info Date: 2014-01-11 (Sat, 11 Jan 2014)

Changed paths: M import.php M libraries/File.class.php M libraries/import.lib.php M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Fix typos

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 0b9132e931966794adb28b60ae2c1122a67c9cd4 https://github.com/phpmyadmin/phpmyadmin/commit/0b9132e931966794adb28b60ae2c... Author: Marc Delisle marc@infomarc.info Date: 2014-01-11 (Sat, 11 Jan 2014)

Changed paths: M po/tr.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/837b9ad088a3...0b9132e93196