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

[Michal Čihař]

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

  Changed paths:
    M ChangeLog
  M libraries/Config.class.php

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