[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2db8da: Merge remote-tracking branch 'origin/MAINT_3_5_0' ...

[Michal Čihař]

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

  Changed paths:
    M scripts/decode_bug.php

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


  Commit: 94eb2dd6c53c6fedeec318a81643b9798f5080d5
      https://github.com/phpmyadmin/phpmyadmin/commit/94eb2dd6c53c6fedeec318a81643b9798f5080d5
  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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e7517ed...94eb2dd