[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 634307: 4.2.3-dev

[Marc Delisle]

  Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 634307329eb6130e43ab1f3bfd1a802c278a88d1
      https://github.com/phpmyadmin/phpmyadmin/commit/634307329eb6130e43ab1f3bfd1a802c278a88d1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.3-dev

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 45f33fdafe9097224a87411daf3a7b5c9ed7dc30
      https://github.com/phpmyadmin/phpmyadmin/commit/45f33fdafe9097224a87411daf3a7b5c9ed7dc30
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M po/fi.po

  Log Message:
  -----------
  Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c3860e8f5bfd...45f33fdafe90