[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7cd866: Merge remote-tracking branch 'origin/master'

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7cd866ce7f85c8155502326f2ff55a4e92b9c661
      https://github.com/phpmyadmin/phpmyadmin/commit/7cd866ce7f85c8155502326f2ff55a4e92b9c661
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M ChangeLog
  M sql.php

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