[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d66311: Merge branch 'MAINT_3_5_0' into QA_3_5

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d66311470055c75c69b4073d5fefe438583f69f5
      https://github.com/phpmyadmin/phpmyadmin/commit/d66311470055c75c69b4073d5fefe438583f69f5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

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


  Commit: cb220630dd4e847bc2a1e342edaa5e6e97c8938b
      https://github.com/phpmyadmin/phpmyadmin/commit/cb220630dd4e847bc2a1e342edaa5e6e97c8938b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7cd866c...cb22063