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

[Michal Čihař]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c9d288777149b05fe3b40c1758c8171fa099b0f9
      https://github.com/phpmyadmin/phpmyadmin/commit/c9d288777149b05fe3b40c1758c8171fa099b0f9
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

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