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

[Rouslan Placella]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1dd6b71a78931773894b18e57221360c8d3ac533
      https://github.com/phpmyadmin/phpmyadmin/commit/1dd6b71a78931773894b18e57221360c8d3ac533
  Author: Rouslan Placella <rouslan at placella.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

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

Conflicts:
	ChangeLog


  Commit: 58c8b7662cb94eea7b4c67dcdcfb93a23d2f91a9
      https://github.com/phpmyadmin/phpmyadmin/commit/58c8b7662cb94eea7b4c67dcdcfb93a23d2f91a9
  Author: Rouslan Placella <rouslan at placella.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/22f57c7...58c8b76