projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 834eaae 5cd8ff9)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 27 Nov 2013 08:18:54 +0000 (00:18 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 27 Nov 2013 08:18:54 +0000 (00:18 -0800)
* PHP-5.5:
  5.4.24-dev now
  merge fix
  add test
  Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.