]> granicus.if.org Git - php/commit
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)
commit22ad8e1b1a8e12b70b0560cc89c6419f00c86708
tree9d9b010d6d252d5bc7a5cf472f58ce3c5369d7e1
parent834eaae52d4aba7c7e92c87f424e73bff8bd711e
parent5cd8ff9885e041e8bb31bd86f44183ed2aeecfde
Merge branch 'PHP-5.5' into PHP-5.6

* 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)