[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 66f03d: Merge remote-tracking branch 'origin/QA_3_5'

[Michal Čihař]

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

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