[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5720fb: Incorrect Drizzle 7 detection (backport from 37781...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5720fb3843dc620c99c1dd29d473b02a5f6c180a
      https://github.com/phpmyadmin/phpmyadmin/commit/5720fb3843dc620c99c1dd29d473b02a5f6c180a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ChangeLog
    M libraries/database_interface.lib.php

  Log Message:
  -----------
  Incorrect Drizzle 7 detection (backport from 37781045)


  Commit: 6db676924283d4f232b9e91e6eca9a0d941681c1
      https://github.com/phpmyadmin/phpmyadmin/commit/6db676924283d4f232b9e91e6eca9a0d941681c1
  Author: Bug Me Not <abcdefg at mailinator.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M po/he.po

  Log Message:
  -----------
  Translated using Weblate (Hebrew)

Currently translated at 23.6% (616 of 2607)


  Commit: 16506af716dff43bd5e4c268d93aae4444d72bce
      https://github.com/phpmyadmin/phpmyadmin/commit/16506af716dff43bd5e4c268d93aae4444d72bce
  Author: Weblate <noreply at weblate.org>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ChangeLog
    M libraries/database_interface.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0


  Commit: 9e13939cbf0a7ed1642019df4b89a716eba71377
      https://github.com/phpmyadmin/phpmyadmin/commit/9e13939cbf0a7ed1642019df4b89a716eba71377
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Log Message:
  -----------
  Merge commit '16506af'


  Commit: 13cd72a26913c4d1874eaf848e91b3c25aed56f7
      https://github.com/phpmyadmin/phpmyadmin/commit/13cd72a26913c4d1874eaf848e91b3c25aed56f7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bcb09bba6c0a...13cd72a26913