[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 432040: Forgot to change imports

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 432040c52d24341ee7951a066f04e97eb1092e95
      https://github.com/phpmyadmin/phpmyadmin/commit/432040c52d24341ee7951a066f04e97eb1092e95
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

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

  Log Message:
  -----------
  Forgot to change imports


  Commit: e39e561ff7a5479d19eee874169360dfb74d3ab8
      https://github.com/phpmyadmin/phpmyadmin/commit/e39e561ff7a5479d19eee874169360dfb74d3ab8
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    M po/da.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/15f9baa8d80f...e39e561ff7a5