]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'origin/master' into phpng
authorXinchen Hui <laruence@php.net>
Fri, 18 Jul 2014 07:52:52 +0000 (15:52 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 18 Jul 2014 08:25:43 +0000 (16:25 +0800)
commit110bf9c720d02b49a1a5d0c6e8affe65f9aa01db
tree9d377d071e33efcbbc3c60f3218a557216edfd71
parent4e378844abbfbc7fec88d063ee0bf2e9026b6b6a
parentf6f621ef69a5a9bf20e94c2714bdebae73860927
Merge remote-tracking branch 'origin/master' into phpng

Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
Zend/zend_compile.h
Zend/zend_opcode.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd_net.c
ext/openssl/xp_ssl.c
main/rfc1867.c