[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6be855: 4.2.2-dev

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6be855a6c6c13f5f0b9c6d1ffa0941e326a7690c
      https://github.com/phpmyadmin/phpmyadmin/commit/6be855a6c6c13f5f0b9c6d1ffa0941e326a7690c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-12 (Mon, 12 May 2014)

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

  Log Message:
  -----------
  4.2.2-dev

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


  Commit: 3ff01604b83c3b75b4554f0742b43b3c775fe209
      https://github.com/phpmyadmin/phpmyadmin/commit/3ff01604b83c3b75b4554f0742b43b3c775fe209
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Log Message:
  -----------
  Merge commit '6be855a'


  Commit: 4baa72d4e54110a9ed9935c0f29fc27567c39b79
      https://github.com/phpmyadmin/phpmyadmin/commit/4baa72d4e54110a9ed9935c0f29fc27567c39b79
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.2-dev

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fda6dba26b59...4baa72d4e541