[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d7b808: Merge remote-tracking branch 'origin/QA_3_5'

[Pootle server]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d7b8082d5235d99e9eef100e7fd0cbd1f03d8881
      https://github.com/phpmyadmin/phpmyadmin/commit/d7b8082d5235d99e9eef100e7fd0cbd1f03d8881
  Author: Pootle server <pootle at cihar.com>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    M ChangeLog
  M js/functions.js

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