Merge branch 'PHP-5.5' into PHP-5.6
authorNikita Popov <nikic@php.net>
Mon, 30 Dec 2013 12:58:29 +0000 (13:58 +0100)
committerNikita Popov <nikic@php.net>
Mon, 30 Dec 2013 12:58:29 +0000 (13:58 +0100)
commit71a36fb6aeb7b51b2819d857162564dbbbccae59
tree707e84b0da1db7b7b923f325ace8743961e58378
parent33ef788abdf224d4ab3a7644ff5138190399f696
parentc7ee97eea0c5ab23835f1fc1523c7c3e118d29d0
Merge branch 'PHP-5.5' into PHP-5.6