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

[Michal Čihař]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d215b238ae248b2d9a07d74f5891df3ba9bbd3f1
      https://github.com/phpmyadmin/phpmyadmin/commit/d215b238ae248b2d9a07d74f5891df3ba9bbd3f1
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M js/functions.js

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


  Commit: 306759ee28a87b8647e717a27f4b0cf11f575fac
      https://github.com/phpmyadmin/phpmyadmin/commit/306759ee28a87b8647e717a27f4b0cf11f575fac
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eabe398...306759e