]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Mon, 21 Jan 2013 03:42:16 +0000 (11:42 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 21 Jan 2013 03:42:16 +0000 (11:42 +0800)
commit85fae636d09a08b53ffd7244cc6e8ec4d4cdab7c
tree1d99c26cd91d2ca86c0ed2d9dbb1bc48f5efb72e
parentf7b99c481d0a943d922e99ad9afa82c45193030e
parent86c1a26169ce44c9ea48e424b62128ee62f31d59
Merge branch 'PHP-5.4' into PHP-5.5

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