]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 26 Jan 2014 22:31:32 +0000 (14:31 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 26 Jan 2014 22:31:32 +0000 (14:31 -0800)
commitc2bb54a246272fb8430002b46450300f27952330
tree1f484dc19db121670fb1c8956dd3e2e7e0779351
parente52c332b382f5255b65654e9bc5be77090581dcc
parent3f19697c0c420791ed349f796309a04107296452
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test