]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Mon, 8 Jul 2013 18:24:58 +0000 (20:24 +0200)
committerAndrey Hristov <andrey@php.net>
Mon, 8 Jul 2013 18:24:58 +0000 (20:24 +0200)
Conflicts:
NEWS

1  2 
ext/mysqlnd/mysqlnd_ps_codec.c

Simple merge