]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorChristoph M. Becker <cmb@php.net>
Tue, 23 Jun 2015 14:36:35 +0000 (16:36 +0200)
committerChristoph M. Becker <cmb@php.net>
Tue, 23 Jun 2015 14:36:35 +0000 (16:36 +0200)
commitbc47f10a97063a53cca9a4901399546f5115933d
treee4ea9fbc6a5a5364931f8a496afa06fd80295608
parent3e1aabbfc3d9e07ad554a49e68d4f9f17b349f84
parent75b2ce28aaa71e63f0185fc64f8c4d73a862ac73
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  Fixed bug #69864 (Segfault in preg_replace_callback)
ext/pcre/php_pcre.c