]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Thu, 10 Apr 2014 15:22:01 +0000 (18:22 +0300)
committerAndrey Hristov <andrey@php.net>
Thu, 10 Apr 2014 15:22:01 +0000 (18:22 +0300)
commit6828437c119c22f47fea5ea7b777aec247c5916c
tree3d1be8cc8f6443232d8d23ae88de42437af73933
parentc2ce0df01b0a6e08367fec64bc35f288872c3d08
parentd3f390a26888eefd012b4634137318797965ea86
Merge branch 'PHP-5.6'

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