[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3c9659: 4.0.3 release

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3c96596f7d897e048be4c2c85d941aadd6141ba9
      https://github.com/phpmyadmin/phpmyadmin/commit/3c96596f7d897e048be4c2c85d941aadd6141ba9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  4.0.3 release


  Commit: bad0352e0382fc5df7013298849918dea3e6eae6
      https://github.com/phpmyadmin/phpmyadmin/commit/bad0352e0382fc5df7013298849918dea3e6eae6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Log Message:
  -----------
  Merge branch 'MAINT_4_0_3' into QA_4_0


  Commit: 773c5312d99ae761708fd2b24c652029a9d0f39a
      https://github.com/phpmyadmin/phpmyadmin/commit/773c5312d99ae761708fd2b24c652029a9d0f39a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix merge conflict


  Commit: cbacb2dcaf95892dbe74d14416c6017807276a75
      https://github.com/phpmyadmin/phpmyadmin/commit/cbacb2dcaf95892dbe74d14416c6017807276a75
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_0'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8002be2ad8a9...cbacb2dcaf95