]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Sun, 17 Nov 2013 09:20:13 +0000 (17:20 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 17 Nov 2013 09:20:13 +0000 (17:20 +0800)
commit140a42f779b83f5c32656741f9fd26f34edc0b1b
tree4748dee66b2c6d6e4f2a758a51870b5ee93f4495
parent81d0ba10bac7bd2c4820374931ad8862cc434800
parent5e9268f4694e917f991857839fac160d2954331f
Merge branch 'PHP-5.5' into PHP-5.6
ext/standard/basic_functions.c