]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Thu, 16 Jan 2014 06:41:52 +0000 (14:41 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 16 Jan 2014 06:41:52 +0000 (14:41 +0800)
1  2 
ext/session/session.c

Simple merge