[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a8df11: 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: a8df11f73d3a58ed1f8980b0cc372f01647d24a8
      https://github.com/phpmyadmin/phpmyadmin/commit/a8df11f73d3a58ed1f8980b0cc372f01647d24a8
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

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