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

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 48c2f5906b9be99c8918e6a6bbf64cb110250c4d
      https://github.com/phpmyadmin/phpmyadmin/commit/48c2f5906b9be99c8918e6a6bbf64cb110250c4d
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M test/AllSeleniumTests.php
  M test/selenium/PmaSeleniumPrivilegesTest.php
  M test/selenium/PmaSeleniumXssTest.php

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


  Commit: 6072fa8537bae107294bc46a8cfb6e43a1841eca
      https://github.com/phpmyadmin/phpmyadmin/commit/6072fa8537bae107294bc46a8cfb6e43a1841eca
  Author: Yuichiro Takahashi <yuichiro at pop07.odn.ne.jp>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M po/ja.po

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


  Commit: 6158a769ea1f6522f6d6d184c8aca5223795cb4a
      https://github.com/phpmyadmin/phpmyadmin/commit/6158a769ea1f6522f6d6d184c8aca5223795cb4a
  Author: Yuichiro Takahashi <yuichiro at pop07.odn.ne.jp>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M po/ja.po

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


  Commit: 53df6ad399b78e9d2bd7b1948e92ca392cb4ac46
      https://github.com/phpmyadmin/phpmyadmin/commit/53df6ad399b78e9d2bd7b1948e92ca392cb4ac46
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

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


  Commit: 49b0ce447297d4eafe494e9809fa33752315b781
      https://github.com/phpmyadmin/phpmyadmin/commit/49b0ce447297d4eafe494e9809fa33752315b781
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M po/ja.po

  Log Message:
  -----------
  Merge branch 'MAINT_3_5_0' into QA_3_5


  Commit: 0787ce9587270ad72f5d45b5e069ff82ec97b050
      https://github.com/phpmyadmin/phpmyadmin/commit/0787ce9587270ad72f5d45b5e069ff82ec97b050
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1def297...0787ce9