[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ab01c5: Merge remote-tracking branch 'origin/master'

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ab01c55a3bed19f68a82e18a4f984b3643caf259
      https://github.com/phpmyadmin/phpmyadmin/commit/ab01c55a3bed19f68a82e18a4f984b3643caf259
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M db_operations.php
    M libraries/plugin_interface.lib.php
    A libraries/plugins/export/ExportMediawiki.class.php
    A libraries/plugins/export/ExportSql.class.php
    R libraries/plugins/export/todo_change_properties/ExportMediawiki.class.php
    R libraries/plugins/export/todo_change_properties/ExportSql.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: a990dd4bea8ece050f73e640648a2143bca51bbe
      https://github.com/phpmyadmin/phpmyadmin/commit/a990dd4bea8ece050f73e640648a2143bca51bbe
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: e2c6672f46281bb716de04b3ff4e4d6b325ace7b
      https://github.com/phpmyadmin/phpmyadmin/commit/e2c6672f46281bb716de04b3ff4e4d6b325ace7b
  Author: Xavier Navarro <xvnavarro at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 983c39c3af522da5221ab0f9f24894f18b31773b
      https://github.com/phpmyadmin/phpmyadmin/commit/983c39c3af522da5221ab0f9f24894f18b31773b
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M db_qbe.php
    A libraries/DBQbe.class.php
    M libraries/relation.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: c93326473e6bef3b4bcd32bb230df6885adda248
      https://github.com/phpmyadmin/phpmyadmin/commit/c93326473e6bef3b4bcd32bb230df6885adda248
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M import.php
    M libraries/DisplayResults.class.php
    M libraries/Table.class.php
    M libraries/relation.lib.php
    M libraries/rte/rte_routines.lib.php
    M sql.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3a1e5d20d5a9...c93326473e6b