[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 099682: Merge remote-tracking branch 'origin/QA_3_5' into ...

[Michal Čihař]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0996825fc74b92acb4ae5ed95a3ce229f679a74a
      https://github.com/phpmyadmin/phpmyadmin/commit/0996825fc74b92acb4ae5ed95a3ce229f679a74a
  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_5' into QA_3_5


  Commit: 59ce8f1dc55850e790edbad58bb059571135827b
      https://github.com/phpmyadmin/phpmyadmin/commit/59ce8f1dc55850e790edbad58bb059571135827b
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c783a31...59ce8f1