]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Tue, 26 Nov 2013 17:02:45 +0000 (19:02 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 26 Nov 2013 17:02:45 +0000 (19:02 +0200)
commit40dc2429047abbd8f5dee5e3ba636ddc5b62f2de
treed74a7de567048bcc84cba7355853023893593e34
parent29ee38bf0d94351b86dc74cf187e884ae46ce71b
parent74ba88e186a0f70caa6e8e5a440a3a204afabf50
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_wireprotocol.c