[Phpmyadmin-git] [phpmyadmin/phpmyadmin] def0d6: 3.5.3-rc1

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: def0d618d78d6ddb6555dea82c24d03dc7d9fa69
      https://github.com/phpmyadmin/phpmyadmin/commit/def0d618d78d6ddb6555dea82c24d03dc7d9fa69
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M Documentation.html
    M README
    M libraries/Config.class.php

  Log Message:
  -----------
  3.5.3-rc1


  Commit: f4112729360dcc72d22b543ca5a554338cf33e25
      https://github.com/phpmyadmin/phpmyadmin/commit/f4112729360dcc72d22b543ca5a554338cf33e25
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

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


  Commit: 2caf95317160f2313a9297bda35d21e4c78a958c
      https://github.com/phpmyadmin/phpmyadmin/commit/2caf95317160f2313a9297bda35d21e4c78a958c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ChangeLog
    M Documentation.html
    M README
    M libraries/Config.class.php

  Log Message:
  -----------
  3.5.4-dev


  Commit: 25e8815f36f861a6664207cc6fe94fc77fd8a7f5
      https://github.com/phpmyadmin/phpmyadmin/commit/25e8815f36f861a6664207cc6fe94fc77fd8a7f5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

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


  Commit: e46884a15ae530a99f5f558383fa1c485c3a2a59
      https://github.com/phpmyadmin/phpmyadmin/commit/e46884a15ae530a99f5f558383fa1c485c3a2a59
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix merge conflicts


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d67b3ee301b7...e46884a15ae5