]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 6 Aug 2014 12:27:56 +0000 (15:27 +0300)
committerAndrey Hristov <andrey@php.net>
Wed, 6 Aug 2014 12:27:56 +0000 (15:27 +0300)
commit41e1ccefd560a3472ba9230b226f14276bdde58d
treef3a34822186fce5bfdb907734885d49aa97bb05d
parent95febf26c67b7ccb8703dc8b005658ebd851cb89
parent9444bc79973f4eb5c76adf2b46b7802205d900bf
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
configure.in
main/php_version.h
ext/mysqlnd/mysqlnd_ps.c
ext/standard/info.c
ext/zlib/zlib_filter.c