]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Sat, 9 Mar 2013 15:10:48 +0000 (23:10 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 9 Mar 2013 15:10:48 +0000 (23:10 +0800)
commit1be745ce1bad3875aa2b1fc7abeefda22f372f19
tree96107212e7ae0cbb98d3659fd8ebb54dcda011e6
parentaf5ada3871d110add52f5a5df8c601d994b9345b
parent7197f0ffccea7f195bc28571e30c389eadda874b
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.c