]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Wed, 16 Jul 2014 16:25:31 +0000 (19:25 +0300)
committerAndrey Hristov <andrey@php.net>
Wed, 16 Jul 2014 16:25:31 +0000 (19:25 +0300)
commit5d6805d4982999bd302b13dbe6052e10de7f9db2
treef22ecdbf99d0ef711cf81e13eb3a0b1ade9751e2
parenta0cc25bbfbe923881f1902fabefecad1e257eb31
parent06f5f65c947891808ef2087dbbe1f6c97daf45ed
Merge branch 'PHP-5.6'

Conflicts:
NEWS
ext/mysqlnd/mysqlnd_net.c