[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 047c41: Merge remote-tracking branch 'origin/QA_3_4' into ...

[Michal Čihař]

  Branch: refs/heads/MAINT_3_5_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 047c418adb5fbf0b99ca0e27fcbebd2c63b46190
      https://github.com/phpmyadmin/phpmyadmin/commit/047c418adb5fbf0b99ca0e27fcbebd2c63b46190
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

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