]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Thu, 2 Aug 2012 04:32:44 +0000 (12:32 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 2 Aug 2012 04:32:44 +0000 (12:32 +0800)
1  2 
Zend/zend_stream.c

Simple merge