[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 100416: Fix variable name

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 100416c25abaebad96b064a291d3b1086d3b6a0a
      https://github.com/phpmyadmin/phpmyadmin/commit/100416c25abaebad96b064a291d3b1086d3b6a0a
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Fix variable name


  Commit: 870bfac62102d0acf4e4fe1dcffdbd2d4316077d
      https://github.com/phpmyadmin/phpmyadmin/commit/870bfac62102d0acf4e4fe1dcffdbd2d4316077d
  Author: Robert Readman <robert_readman at hotmail.com>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M po/en_GB.po

  Log Message:
  -----------
  Translated using Weblate (English (United Kingdom))

Currently translated at 99.9% (2607 of 2610)


  Commit: 08ac91f1be3994ece3e5823a9a70a6ca83c8593c
      https://github.com/phpmyadmin/phpmyadmin/commit/08ac91f1be3994ece3e5823a9a70a6ca83c8593c
  Author: Myung Han Yu <greatymh at gmail.com>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 74.2% (1937 of 2610)


  Commit: 07d27834509002f1155e4e2f6fcc117cd28aa8c5
      https://github.com/phpmyadmin/phpmyadmin/commit/07d27834509002f1155e4e2f6fcc117cd28aa8c5
  Author: Weblate <noreply at weblate.org>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0


  Commit: f9300c7b07b49ba9a04ac1ce99b04275bbb4a8e8
      https://github.com/phpmyadmin/phpmyadmin/commit/f9300c7b07b49ba9a04ac1ce99b04275bbb4a8e8
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

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

  Log Message:
  -----------
  bug #4001 Import error: Class 'ImportOds' not found


  Commit: 5638d6b956326a8408d2b5ba5ea8d330fb387418
      https://github.com/phpmyadmin/phpmyadmin/commit/5638d6b956326a8408d2b5ba5ea8d330fb387418
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

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

  Log Message:
  -----------
  Merge branch 'QA_4_0'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3f385970f4bf...5638d6b95632