[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 18b7a2: Fix corrupted file caused by wrong merge

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 18b7a27fe0674e22c1bbd7ebd8f2404d9c6f2a39
      https://github.com/phpmyadmin/phpmyadmin/commit/18b7a27fe0674e22c1bbd7ebd8f2404d9c6f2a39
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Fix corrupted file caused by wrong merge