[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a36685: 3.5.5 release

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a366855b160b057c95980da03af065e0ac14e86f
      https://github.com/phpmyadmin/phpmyadmin/commit/a366855b160b057c95980da03af065e0ac14e86f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  3.5.5 release


  Commit: e5753c26f8ce64d301ebb21671a431f1b940bf35
      https://github.com/phpmyadmin/phpmyadmin/commit/e5753c26f8ce64d301ebb21671a431f1b940bf35
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/58c6fa955e05...e5753c26f8ce