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

[Michal Čihař]

  Branch: refs/heads/QA_3_4
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 560c0a92a7d8ba431a6b6b263f573e70e656bff0
      https://github.com/phpmyadmin/phpmyadmin/commit/560c0a92a7d8ba431a6b6b263f573e70e656bff0
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

  Changed paths:
    M tbl_tracking.php

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